@spinajs/http 2.0.345 → 2.0.346

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/lib/cjs/cache.d.ts +3 -3
  2. package/lib/cjs/cache.d.ts.map +1 -1
  3. package/lib/cjs/cache.js +12 -13
  4. package/lib/cjs/cache.js.map +1 -1
  5. package/lib/cjs/cli/GenerateControllerCache.d.ts.map +1 -1
  6. package/lib/cjs/cli/GenerateControllerCache.js +4 -3
  7. package/lib/cjs/cli/GenerateControllerCache.js.map +1 -1
  8. package/lib/mjs/cache.d.ts +3 -3
  9. package/lib/mjs/cache.d.ts.map +1 -1
  10. package/lib/mjs/cache.js +14 -14
  11. package/lib/mjs/cache.js.map +1 -1
  12. package/lib/mjs/cli/GenerateControllerCache.d.ts.map +1 -1
  13. package/lib/mjs/cli/GenerateControllerCache.js +4 -3
  14. package/lib/mjs/cli/GenerateControllerCache.js.map +1 -1
  15. package/lib/tsconfig.cjs.tsbuildinfo +1 -1
  16. package/lib/tsconfig.mjs.tsbuildinfo +1 -1
  17. package/package.json +11 -11
package/lib/cjs/cache.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ClassInfo } from '@spinajs/di';
1
+ import { AsyncService, ClassInfo } from '@spinajs/di';
2
2
  import { fs as fFs, FileHasher } from '@spinajs/fs';
3
3
  import { BaseController } from './controllers.js';
4
4
  import { Log } from '@spinajs/log';
@@ -11,7 +11,7 @@ import { Log } from '@spinajs/log';
11
11
  * And we need this for proper parameter assignment in controller routes
12
12
  *
13
13
  */
14
- export declare class DefaultControllerCache {
14
+ export declare class DefaultControllerCache extends AsyncService {
15
15
  protected Log: Log;
16
16
  /**
17
17
  * Loaded controllers
@@ -22,7 +22,7 @@ export declare class DefaultControllerCache {
22
22
  */
23
23
  protected CacheFS: fFs;
24
24
  protected Hasher: FileHasher;
25
+ resolve(): Promise<void>;
25
26
  getCache(controller: ClassInfo<BaseController>): Promise<any>;
26
- generate(): Promise<void>;
27
27
  }
28
28
  //# sourceMappingURL=cache.d.ts.map
package/lib/cjs/cache.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,EAAE,IAAI,GAAG,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBAAa,sBAAsB;IAEjC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;OAEG;IAEI,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE9D;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC;IAGvB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAEhB,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC;IAa9C,QAAQ;CAgCtB"}
1
+ {"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAc,SAAS,EAAa,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,EAAE,IAAI,GAAG,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBACa,sBAAuB,SAAQ,YAAY;IAEtD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;OAEG;IAEI,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE9D;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC;IAGvB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAEhB,OAAO;IAIP,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC;CAmC5D"}
package/lib/cjs/cache.js CHANGED
@@ -23,26 +23,21 @@ const log_1 = require("@spinajs/log");
23
23
  * And we need this for proper parameter assignment in controller routes
24
24
  *
25
25
  */
26
- class DefaultControllerCache {
26
+ let DefaultControllerCache = class DefaultControllerCache extends di_1.AsyncService {
27
+ async resolve() {
28
+ this.Log.info(`Controller cache dir is: ${this.CacheFS.resolvePath('')}`);
29
+ }
27
30
  async getCache(controller) {
28
31
  const file = controller.file.replace('.js', '.d.ts');
29
32
  const hash = await this.Hasher.hash(file);
30
33
  const exists = await this.CacheFS.exists(hash);
31
34
  if (!exists) {
32
- this.Log.warn(`Controller cache not exists for ${controller.name}, regenerating cache ...`);
33
- await this.generate();
34
- }
35
- return await this.CacheFS.read(hash).then((x) => JSON.parse(x));
36
- }
37
- async generate() {
38
- const controllers = await this.Controllers;
39
- for (const controller of controllers) {
35
+ this.Log.warn(`Controller cache not exists for ${controller.name} at location file: ${this.CacheFS.resolvePath(hash)}, regenerating cache ...`);
40
36
  const file = controller.file.replace('.js', '.d.ts');
41
- const hash = await this.Hasher.hash(file);
42
37
  let parameters = {};
43
38
  const exists = await this.CacheFS.exists(hash);
44
39
  if (!exists) {
45
- this.Log.trace(`Controller cache not exists for ${controller.name}, generating cache...`);
40
+ this.Log.info(`Controller cache not exists for ${controller.name}, generating cache, file: ${this.CacheFS.resolvePath(hash)}`);
46
41
  const compiler = new reflection_1.TypescriptCompiler(file);
47
42
  const members = compiler.getClassMembers(controller.name);
48
43
  members.forEach((v, k) => {
@@ -54,11 +49,12 @@ class DefaultControllerCache {
54
49
  });
55
50
  });
56
51
  await this.CacheFS.write(hash, JSON.stringify(parameters));
57
- this.Log.trace(`Ending generating controller cache for ${controller.name}`);
52
+ this.Log.info(`Ending generating controller cache for ${controller.name}`);
58
53
  }
59
54
  }
55
+ return await this.CacheFS.read(hash).then((x) => JSON.parse(x));
60
56
  }
61
- }
57
+ };
62
58
  exports.DefaultControllerCache = DefaultControllerCache;
63
59
  __decorate([
64
60
  (0, log_1.Logger)('http'),
@@ -76,4 +72,7 @@ __decorate([
76
72
  (0, di_1.Autoinject)(fs_1.FileHasher),
77
73
  __metadata("design:type", fs_1.FileHasher)
78
74
  ], DefaultControllerCache.prototype, "Hasher", void 0);
75
+ exports.DefaultControllerCache = DefaultControllerCache = __decorate([
76
+ (0, di_1.Singleton)()
77
+ ], DefaultControllerCache);
79
78
  //# sourceMappingURL=cache.js.map
package/lib/cjs/cache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAAoD;AACpD,oDAAwE;AACxE,oCAAgE;AAEhE,sCAA2C;AAE3C;;;;;;;;GAQG;AACH,MAAa,sBAAsB;IAmB1B,KAAK,CAAC,QAAQ,CAAC,UAAqC;QACzD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,UAAU,CAAC,IAAI,0BAA0B,CAAC,CAAC;YAC5F,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;SACvB;QAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;QAE3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,UAAU,GAEV,EAAE,CAAC;YAEP,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,UAAU,CAAC,IAAI,uBAAuB,CAAC,CAAC;gBAE1F,MAAM,QAAQ,GAAG,IAAI,+BAAkB,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBACvB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE;wBAC9B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;4BAClB,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;yBACpB;wBAED,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvD,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;gBAE3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;aAC7E;SACF;IACH,CAAC;CACF;AAhED,wDAgEC;AA9DW;IADT,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;mDAAC;AAMZ;IADN,IAAA,0BAAa,EAAC,oBAAoB,EAAE,yBAAyB,CAAC;;2DACD;AAMpD;IADT,IAAA,eAAU,EAAC,yBAAyB,CAAC;8BACnB,OAAG;uDAAC;AAGb;IADT,IAAA,eAAU,EAAC,eAAU,CAAC;8BACL,eAAU;sDAAC"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAA6E;AAC7E,oDAAwE;AACxE,oCAAgE;AAEhE,sCAA2C;AAE3C;;;;;;;;GAQG;AAEI,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,iBAAY;IAmB/C,KAAK,CAAC,OAAO;QAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,UAAqC;QACzD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,UAAU,CAAC,IAAI,sBAAsB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YAChJ,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,IAAI,UAAU,GAEV,EAAE,CAAC;YAEP,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,UAAU,CAAC,IAAI,6BAA6B,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAE/H,MAAM,QAAQ,GAAG,IAAI,+BAAkB,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBACvB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE;wBAC9B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;4BAClB,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;yBACpB;wBAED,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvD,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;gBAC3D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,0CAA0C,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;aAC5E;SACF;QAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;CACF,CAAA;AA1DY,wDAAsB;AAEvB;IADT,IAAA,YAAM,EAAC,MAAM,CAAC;8BACA,SAAG;mDAAC;AAMZ;IADN,IAAA,0BAAa,EAAC,oBAAoB,EAAE,yBAAyB,CAAC;;2DACD;AAMpD;IADT,IAAA,eAAU,EAAC,yBAAyB,CAAC;8BACnB,OAAG;uDAAC;AAGb;IADT,IAAA,eAAU,EAAC,eAAU,CAAC;8BACL,eAAU;sDAAC;iCAjBlB,sBAAsB;IADlC,IAAA,cAAS,GAAE;GACC,sBAAsB,CA0DlC"}
package/lib/cjs/cli/GenerateControllerCache.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateControllerCache.d.ts","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AACnD,OAAO,EAAU,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAUtC"}
1
+ {"version":3,"file":"GenerateControllerCache.d.ts","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AACnD,OAAO,EAAU,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAWtC"}
package/lib/cjs/cli/GenerateControllerCache.js CHANGED
@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.ControllersCacheCommand = void 0;
13
13
  const cli_1 = require("@spinajs/cli");
14
14
  const log_common_1 = require("@spinajs/log-common");
15
- const cache_js_1 = require("../cache.js");
15
+ //import { DefaultControllerCache } from '../cache.js';
16
16
  const di_1 = require("@spinajs/di");
17
17
  const fs_1 = require("@spinajs/fs");
18
18
  let ControllersCacheCommand = class ControllersCacheCommand extends cli_1.CliCommand {
@@ -20,8 +20,9 @@ let ControllersCacheCommand = class ControllersCacheCommand extends cli_1.CliCom
20
20
  await di_1.DI.resolve(fs_1.fsService);
21
21
  this.Log.info('Generating controllers cache ...');
22
22
  const fs = di_1.DI.resolve('__file_provider__', ['__fs_controller_cache__']);
23
- const cache = di_1.DI.resolve(cache_js_1.DefaultControllerCache);
24
- await cache.generate();
23
+ // TODO: fix this
24
+ // const cache = DI.resolve(DefaultControllerCache);
25
+ // await cache.generate();
25
26
  this.Log.info('Controllers cache generated at path: ', fs.resolvePath(''));
26
27
  }
27
28
  };
package/lib/cjs/cli/GenerateControllerCache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateControllerCache.js","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAmD;AACnD,oDAAkD;AAClD,0CAAqD;AACrD,oCAAiC;AACjC,oCAA4C;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,gBAAU;IAI9C,KAAK,CAAC,OAAO;QAClB,MAAM,OAAE,CAAC,OAAO,CAAC,cAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAElD,MAAM,EAAE,GAAG,OAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,OAAE,CAAC,OAAO,CAAC,iCAAsB,CAAC,CAAC;QACjD,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AAdY,0DAAuB;AAExB;IADT,IAAA,mBAAM,EAAC,MAAM,CAAC;8BACA,gBAAG;oDAAC;kCAFR,uBAAuB;IADnC,IAAA,aAAO,EAAC,wBAAwB,EAAE,4BAA4B,CAAC;GACnD,uBAAuB,CAcnC"}
1
+ {"version":3,"file":"GenerateControllerCache.js","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAmD;AACnD,oDAAkD;AAClD,uDAAuD;AACvD,oCAAiC;AACjC,oCAA4C;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,gBAAU;IAI9C,KAAK,CAAC,OAAO;QAClB,MAAM,OAAE,CAAC,OAAO,CAAC,cAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAElD,MAAM,EAAE,GAAG,OAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC5E,iBAAiB;QACnB,qDAAqD;QACvD,6BAA6B;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AAfY,0DAAuB;AAExB;IADT,IAAA,mBAAM,EAAC,MAAM,CAAC;8BACA,gBAAG;oDAAC;kCAFR,uBAAuB;IADnC,IAAA,aAAO,EAAC,wBAAwB,EAAE,4BAA4B,CAAC;GACnD,uBAAuB,CAenC"}
package/lib/mjs/cache.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ClassInfo } from '@spinajs/di';
1
+ import { AsyncService, ClassInfo } from '@spinajs/di';
2
2
  import { fs as fFs, FileHasher } from '@spinajs/fs';
3
3
  import { BaseController } from './controllers.js';
4
4
  import { Log } from '@spinajs/log';
@@ -11,7 +11,7 @@ import { Log } from '@spinajs/log';
11
11
  * And we need this for proper parameter assignment in controller routes
12
12
  *
13
13
  */
14
- export declare class DefaultControllerCache {
14
+ export declare class DefaultControllerCache extends AsyncService {
15
15
  protected Log: Log;
16
16
  /**
17
17
  * Loaded controllers
@@ -22,7 +22,7 @@ export declare class DefaultControllerCache {
22
22
  */
23
23
  protected CacheFS: fFs;
24
24
  protected Hasher: FileHasher;
25
+ resolve(): Promise<void>;
25
26
  getCache(controller: ClassInfo<BaseController>): Promise<any>;
26
- generate(): Promise<void>;
27
27
  }
28
28
  //# sourceMappingURL=cache.d.ts.map
package/lib/mjs/cache.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,SAAS,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,EAAE,IAAI,GAAG,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBAAa,sBAAsB;IAEjC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;OAEG;IAEI,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE9D;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC;IAGvB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAEhB,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC;IAa9C,QAAQ;CAgCtB"}
1
+ {"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAc,SAAS,EAAa,MAAM,aAAa,CAAC;AAE7E,OAAO,EAAE,EAAE,IAAI,GAAG,EAAE,UAAU,EAAc,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;;;GAQG;AACH,qBACa,sBAAuB,SAAQ,YAAY;IAEtD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;OAEG;IAEI,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAE9D;;OAEG;IAEH,SAAS,CAAC,OAAO,EAAE,GAAG,CAAC;IAGvB,SAAS,CAAC,MAAM,EAAE,UAAU,CAAC;IAEhB,OAAO;IAIP,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,cAAc,CAAC;CAmC5D"}
package/lib/mjs/cache.js CHANGED
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
7
7
  var __metadata = (this && this.__metadata) || function (k, v) {
8
8
  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
9
  };
10
- import { Autoinject } from '@spinajs/di';
10
+ import { AsyncService, Autoinject, Singleton } from '@spinajs/di';
11
11
  import { TypescriptCompiler, ListFromFiles } from '@spinajs/reflection';
12
12
  import { fs as fFs, FileHasher, FileSystem } from '@spinajs/fs';
13
13
  import { Logger, Log } from '@spinajs/log';
@@ -20,26 +20,21 @@ import { Logger, Log } from '@spinajs/log';
20
20
  * And we need this for proper parameter assignment in controller routes
21
21
  *
22
22
  */
23
- export class DefaultControllerCache {
23
+ let DefaultControllerCache = class DefaultControllerCache extends AsyncService {
24
+ async resolve() {
25
+ this.Log.info(`Controller cache dir is: ${this.CacheFS.resolvePath('')}`);
26
+ }
24
27
  async getCache(controller) {
25
28
  const file = controller.file.replace('.js', '.d.ts');
26
29
  const hash = await this.Hasher.hash(file);
27
30
  const exists = await this.CacheFS.exists(hash);
28
31
  if (!exists) {
29
- this.Log.warn(`Controller cache not exists for ${controller.name}, regenerating cache ...`);
30
- await this.generate();
31
- }
32
- return await this.CacheFS.read(hash).then((x) => JSON.parse(x));
33
- }
34
- async generate() {
35
- const controllers = await this.Controllers;
36
- for (const controller of controllers) {
32
+ this.Log.warn(`Controller cache not exists for ${controller.name} at location file: ${this.CacheFS.resolvePath(hash)}, regenerating cache ...`);
37
33
  const file = controller.file.replace('.js', '.d.ts');
38
- const hash = await this.Hasher.hash(file);
39
34
  let parameters = {};
40
35
  const exists = await this.CacheFS.exists(hash);
41
36
  if (!exists) {
42
- this.Log.trace(`Controller cache not exists for ${controller.name}, generating cache...`);
37
+ this.Log.info(`Controller cache not exists for ${controller.name}, generating cache, file: ${this.CacheFS.resolvePath(hash)}`);
43
38
  const compiler = new TypescriptCompiler(file);
44
39
  const members = compiler.getClassMembers(controller.name);
45
40
  members.forEach((v, k) => {
@@ -51,11 +46,12 @@ export class DefaultControllerCache {
51
46
  });
52
47
  });
53
48
  await this.CacheFS.write(hash, JSON.stringify(parameters));
54
- this.Log.trace(`Ending generating controller cache for ${controller.name}`);
49
+ this.Log.info(`Ending generating controller cache for ${controller.name}`);
55
50
  }
56
51
  }
52
+ return await this.CacheFS.read(hash).then((x) => JSON.parse(x));
57
53
  }
58
- }
54
+ };
59
55
  __decorate([
60
56
  Logger('http'),
61
57
  __metadata("design:type", Log)
@@ -72,4 +68,8 @@ __decorate([
72
68
  Autoinject(FileHasher),
73
69
  __metadata("design:type", FileHasher)
74
70
  ], DefaultControllerCache.prototype, "Hasher", void 0);
71
+ DefaultControllerCache = __decorate([
72
+ Singleton()
73
+ ], DefaultControllerCache);
74
+ export { DefaultControllerCache };
75
75
  //# sourceMappingURL=cache.js.map
package/lib/mjs/cache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,UAAU,EAAa,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,EAAE,EAAE,IAAI,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAE3C;;;;;;;;GAQG;AACH,MAAM,OAAO,sBAAsB;IAmB1B,KAAK,CAAC,QAAQ,CAAC,UAAqC;QACzD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,UAAU,CAAC,IAAI,0BAA0B,CAAC,CAAC;YAC5F,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;SACvB;QAED,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;QAE3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,UAAU,GAEV,EAAE,CAAC;YAEP,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,MAAM,EAAE;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,UAAU,CAAC,IAAI,uBAAuB,CAAC,CAAC;gBAE1F,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC1D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;oBACvB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,EAAE;wBAC9B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;4BAClB,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;yBACpB;wBAED,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvD,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBAEH,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;gBAE3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0CAA0C,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;aAC7E;SACF;IACH,CAAC;CACF;AA9DW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;mDAAC;AAMZ;IADN,aAAa,CAAC,oBAAoB,EAAE,yBAAyB,CAAC;;2DACD;AAMpD;IADT,UAAU,CAAC,yBAAyB,CAAC;8BACnB,GAAG;uDAAC;AAGb;IADT,UAAU,CAAC,UAAU,CAAC;8BACL,UAAU;sDAAC"}
1
+ {"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/cache.ts"],"names":[],"mappings":"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"}
package/lib/mjs/cli/GenerateControllerCache.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateControllerCache.d.ts","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AACnD,OAAO,EAAU,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAUtC"}
1
+ {"version":3,"file":"GenerateControllerCache.d.ts","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAW,MAAM,cAAc,CAAC;AACnD,OAAO,EAAU,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAKlD,qBACa,uBAAwB,SAAQ,UAAU;IAErD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAWtC"}
package/lib/mjs/cli/GenerateControllerCache.js CHANGED
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
9
9
  };
10
10
  import { CliCommand, Command } from '@spinajs/cli';
11
11
  import { Logger, Log } from '@spinajs/log-common';
12
- import { DefaultControllerCache } from '../cache.js';
12
+ //import { DefaultControllerCache } from '../cache.js';
13
13
  import { DI } from '@spinajs/di';
14
14
  import { fsService } from '@spinajs/fs';
15
15
  let ControllersCacheCommand = class ControllersCacheCommand extends CliCommand {
@@ -17,8 +17,9 @@ let ControllersCacheCommand = class ControllersCacheCommand extends CliCommand {
17
17
  await DI.resolve(fsService);
18
18
  this.Log.info('Generating controllers cache ...');
19
19
  const fs = DI.resolve('__file_provider__', ['__fs_controller_cache__']);
20
- const cache = DI.resolve(DefaultControllerCache);
21
- await cache.generate();
20
+ // TODO: fix this
21
+ // const cache = DI.resolve(DefaultControllerCache);
22
+ // await cache.generate();
22
23
  this.Log.info('Controllers cache generated at path: ', fs.resolvePath(''));
23
24
  }
24
25
  };
package/lib/mjs/cli/GenerateControllerCache.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateControllerCache.js","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAM,MAAM,aAAa,CAAC;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,UAAU;IAI9C,KAAK,CAAC,OAAO;QAClB,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAElD,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,EAAE,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACjD,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AAZW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;oDAAC;AAFR,uBAAuB;IADnC,OAAO,CAAC,wBAAwB,EAAE,4BAA4B,CAAC;GACnD,uBAAuB,CAcnC"}
1
+ {"version":3,"file":"GenerateControllerCache.js","sourceRoot":"","sources":["../../../src/cli/GenerateControllerCache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAClD,uDAAuD;AACvD,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,SAAS,EAAM,MAAM,aAAa,CAAC;AAGrC,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,UAAU;IAI9C,KAAK,CAAC,OAAO;QAClB,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAElD,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC;QAC5E,iBAAiB;QACnB,qDAAqD;QACvD,6BAA6B;QACzB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uCAAuC,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,CAAC;CACF,CAAA;AAbW;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;oDAAC;AAFR,uBAAuB;IADnC,OAAO,CAAC,wBAAwB,EAAE,4BAA4B,CAAC;GACnD,uBAAuB,CAenC"}