@spinajs/reflection 1.0.4 → 1.2.7

package/lib/index.d.ts

@@ -1,17 +1,63 @@
-import * as ts from "typescript";
+import * as ts from 'typescript';
+import { Exception } from '@spinajs/exceptions';
+/**
+ * Class info structure
+ */
 export declare class ClassInfo<T> {
+    /**
+     * Full file path of loaded class
+     */
     file: string;
+    /**
+     * Class name
+     */
     name: string;
+    /**
+     * Javascript class object
+     */
     type: any;
+    /**
+     * Resolved instance
+     */
     instance?: T;
 }
+/**
+ * Exception thrown when some error during reflection occurs
+ */
+export declare class ReflectionException extends Exception {
+}
+/**
+ * Helper class for extracting various information from typescript source code
+ */
 export declare class TypescriptCompiler {
     private tsFile;
     private compiled;
     constructor(filename: string);
+    /**
+     *
+     * Extracts all members info from typescript class eg. method name, parameters, return types etc.
+     *
+     * @param className - name of class to parse
+     */
     getClassMembers(className: string): Map<string, ts.MethodDeclaration>;
     private walkClassNode;
     private walkMemberNode;
 }
-export declare function ResolveFromFiles(filter: string, configPath: string): (target: any, propertyKey: string | symbol) => void;
-export declare function ListFromFiles(filter: string, configPath: string): (target: any, propertyKey: string | symbol) => void;
+/**
+ * Returns resolved instances of classes from specified files.
+ * It automatically checks if should resolve promise or not, calls resolve strategy, checks if should return new or signleton etc, resolves
+ * dependencies etc.
+ *
+ * @param filter - files to look at, uses glob pattern to search
+ * @param configPath - dir paths taken from app config eg. "system.dirs.controllers". Path MUST be avaible in configuration
+ *
+ */
+export declare function ResolveFromFiles(filter: string, configPath: string, typeMatcher?: (fileName: string) => string): (target: any, propertyKey: string | symbol) => void;
+/**
+ * Returns list of class types found in specified path. It do not resolve / create instances
+ *
+ * @param filter - files to look at, uses glob pattern to search
+ * @param configPath - dir paths taken from app config eg. "system.dirs.controllers". Path MUST be avaible in configuration
+ *
+ */
+export declare function ListFromFiles(filter: string, configPath: string, typeMatcher?: (fileName: string) => string): (target: any, propertyKey: string | symbol) => void;

package/lib/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ListFromFiles = exports.ResolveFromFiles = exports.TypescriptCompiler = exports.ReflectionException = exports.ClassInfo = void 0;
 const fs = require("fs");
 const glob = require("glob");
 const path = require("path");
@@ -7,26 +8,43 @@ const ts = require("typescript");
 const configuration_1 = require("@spinajs/configuration");
 const di_1 = require("@spinajs/di");
 const exceptions_1 = require("@spinajs/exceptions");
+const log_1 = require("@spinajs/log");
+/**
+ * Class info structure
+ */
 class ClassInfo {
 }
 exports.ClassInfo = ClassInfo;
+/**
+ * Exception thrown when some error during reflection occurs
+ */
+class ReflectionException extends exceptions_1.Exception {
+}
+exports.ReflectionException = ReflectionException;
+/**
+ * Helper class for extracting various information from typescript source code
+ */
 class TypescriptCompiler {
     constructor(filename) {
         this.tsFile = filename;
         this.compiled = ts.createProgram([this.tsFile], {
             module: ts.ModuleKind.CommonJS,
-            target: ts.ScriptTarget.Latest
+            target: ts.ScriptTarget.Latest,
         });
     }
+    /**
+     *
+     * Extracts all members info from typescript class eg. method name, parameters, return types etc.
+     *
+     * @param className - name of class to parse
+     */
     getClassMembers(className) {
         const members = new Map();
-        for (const sourceFile of this.compiled.getSourceFiles()) {
-            if (!sourceFile.isDeclarationFile) {
-                ts.forEachChild(sourceFile, this.walkClassNode(className, this.walkMemberNode((method) => {
-                    members.set(method.name.getText(), method);
-                })));
-            }
-        }
+        const sourceFile = this.compiled.getSourceFile(this.tsFile);
+        // Walk the tree to search for classes
+        ts.forEachChild(sourceFile, this.walkClassNode(className, this.walkMemberNode((method) => {
+            members.set(method.name.getText(), method);
+        })));
         return members;
     }
     walkClassNode(className, callback) {
@@ -41,29 +59,47 @@ class TypescriptCompiler {
     }
     walkMemberNode(callback) {
         return (node) => {
-            if (node.kind === ts.SyntaxKind.MethodDeclaration) {
-                const method = node;
-                callback(method);
+            for (const member of node.members) {
+                if (member.kind === ts.SyntaxKind.MethodDeclaration) {
+                    const method = member;
+                    callback(method);
+                }
             }
         };
     }
 }
 exports.TypescriptCompiler = TypescriptCompiler;
-function ResolveFromFiles(filter, configPath) {
-    return _listOrResolveFromFiles(filter, configPath, true);
+/**
+ * Returns resolved instances of classes from specified files.
+ * It automatically checks if should resolve promise or not, calls resolve strategy, checks if should return new or signleton etc, resolves
+ * dependencies etc.
+ *
+ * @param filter - files to look at, uses glob pattern to search
+ * @param configPath - dir paths taken from app config eg. "system.dirs.controllers". Path MUST be avaible in configuration
+ *
+ */
+function ResolveFromFiles(filter, configPath, typeMatcher) {
+    return _listOrResolveFromFiles(filter, configPath, true, typeMatcher);
 }
 exports.ResolveFromFiles = ResolveFromFiles;
-function ListFromFiles(filter, configPath) {
-    return _listOrResolveFromFiles(filter, configPath, false);
+/**
+ * Returns list of class types found in specified path. It do not resolve / create instances
+ *
+ * @param filter - files to look at, uses glob pattern to search
+ * @param configPath - dir paths taken from app config eg. "system.dirs.controllers". Path MUST be avaible in configuration
+ *
+ */
+function ListFromFiles(filter, configPath, typeMatcher) {
+    return _listOrResolveFromFiles(filter, configPath, false, typeMatcher);
 }
 exports.ListFromFiles = ListFromFiles;
-function _listOrResolveFromFiles(filter, configPath, resolve) {
+function _listOrResolveFromFiles(filter, configPath, resolve, typeMatcher) {
     return (target, propertyKey) => {
         if (!filter) {
-            throw new exceptions_1.ArgumentException("filter parameter is null or empty");
+            throw new exceptions_1.InvalidArgument('filter parameter is null or empty');
         }
         if (!configPath) {
-            throw new exceptions_1.ArgumentException("configPath parameter is null or empty");
+            throw new exceptions_1.InvalidArgument('configPath parameter is null or empty');
         }
         let instances = null;
         const getter = () => {
@@ -77,29 +113,43 @@ function _listOrResolveFromFiles(filter, configPath, resolve) {
             get: getter,
         });
         function _loadInstances() {
-            const config = di_1.DI.resolve(configuration_1.Configuration);
-            const directories = config.get(configPath);
+            const config = di_1.DI.get(configuration_1.Configuration);
+            const logger = di_1.DI.resolve(log_1.Log, ['reflection']);
+            let directories = config.get(configPath);
             if (!directories || directories.length === 0) {
                 return [];
             }
+            if (!Array.isArray(directories)) {
+                directories = [directories];
+            }
             let promised = false;
-            const result = directories.map((d) => path.normalize(d))
-                .filter((d) => fs.existsSync(d))
+            const result = directories
+                .filter((d) => {
+                /* eslint-disable */
+                const exists = fs.existsSync(path.normalize(d));
+                if (!exists) {
+                    logger.warn(`Directory ${d} not exists`);
+                }
+                return exists;
+            })
                 .flatMap((d) => glob.sync(path.join(d, filter)))
                 .map((f) => {
+                logger.trace(`Loading file ${f}`);
                 const name = path.parse(f).name;
-                const type = require(f)[name];
+                const nameToResolve = typeMatcher ? typeMatcher(name) : name;
+                /* eslint-disable */
+                const type = require(f)[`${nameToResolve}`];
                 if (!type) {
-                    throw new exceptions_1.IOException(`cannot find class ${name} in file ${f}`);
+                    throw new ReflectionException(`cannot find class ${nameToResolve} in file ${f}`);
                 }
                 if (resolve) {
-                    if (type.prototype instanceof di_1.AsyncResolveStrategy) {
+                    if (type.prototype instanceof di_1.AsyncModule) {
                         promised = true;
                         return di_1.DI.resolve(type).then((instance) => {
                             return {
                                 file: f,
                                 instance,
-                                name,
+                                name: nameToResolve,
                                 type,
                             };
                         });
@@ -108,11 +158,11 @@ function _listOrResolveFromFiles(filter, configPath, resolve) {
                 return {
                     file: f,
                     instance: resolve ? di_1.DI.resolve(type) : null,
-                    name,
+                    name: nameToResolve,
                     type,
                 };
             });
-            return (promised && resolve) ? Promise.all(result) : result;
+            return promised && resolve ? Promise.all(result) : result;
         }
     };
 }

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spinajs/reflection",
-  "version": "1.0.4",
+  "version": "1.2.7",
   "description": "SpinaJS reflection helpers",
   "main": "lib/index.js",
   "private": false,
@@ -8,15 +8,20 @@
     "test": "ts-mocha -p tsconfig.json test/**/*.test.ts",
     "coverage": "nyc npm run test",
     "build-docs": "rimraf docs && typedoc --options typedoc.json src/",
-    "build": "tsc",
+    "build": "npm run clean && npm run compile",
+    "compile": "tsc -p tsconfig.build.json",
+    "clean": "",
     "prepare": "npm run build",
-    "format": "prettier --write \"src/**/*.ts\" \"src/**/*.js\"",
-    "lint": "tslint -p tsconfig.json",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "eslint -c .eslintrc.js --ext .ts src",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags"
   },
+  "files": [
+    "lib/**/*"
+  ],
   "author": "SpinaJS <spinajs@coderush.pl> (https://github.com/spinajs/core)",
   "license": "MIT",
   "bugs": {
@@ -24,31 +29,11 @@
   },
   "homepage": "https://github.com/spinajs/reflection#readme",
   "dependencies": {
-    "@spinajs/configuration": "^1.0.0",
-    "@spinajs/di": "^1.0.3",
-    "@spinajs/exceptions": "^1.0.0",
-    "@types/mocha": "^5.2.7"
+    "@spinajs/configuration": "^1.2.7",
+    "@spinajs/di": "^1.2.7",
+    "@spinajs/exceptions": "^1.2.7",
+    "@spinajs/log": "^1.2.7",
+    "lodash": "^4.17.21"
   },
-  "devDependencies": {
-    "@types/bunyan": "^1.8.6",
-    "@types/chai": "^4.1.7",
-    "@types/chai-as-promised": "^7.1.0",
-    "@types/chai-subset": "^1.3.3",
-    "@types/lodash": "^4.14.136",
-    "chai": "^4.2.0",
-    "chai-as-promised": "^7.1.1",
-    "chai-subset": "^1.6.0",
-    "mocha": "^6.1.4",
-    "nyc": "^14.1.1",
-    "prettier": "^1.18.2",
-    "ts-mocha": "^6.0.0",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.20.1",
-    "tslint-circular-dependencies": "^0.1.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-config-standard": "^8.0.1",
-    "tslint-no-unused-expression-chai": "^0.1.4",
-    "typedoc": "^0.14.2",
-    "typescript": "^3.5.3"
-  }
+  "gitHead": "389cf142b4ca63b7850b93fc858184ddcbb43ce1"
 }

package/test/reflection.test.ts

@@ -1,195 +0,0 @@
-import { Configuration } from '@spinajs/configuration';
-import { DI } from '@spinajs/di';
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
-import * as chaiSubset from 'chai-subset';
-import _ = require('lodash');
-import 'mocha';
-import { join, normalize, resolve } from 'path';
-import { ResolveFromFiles, ListFromFiles } from '../src';
-import { FooService } from './test-services/singletons/FooService';
-import { IOException } from '@spinajs/exceptions';
-
-export function dir(path: string) {
-    return resolve(normalize(join(__dirname, path)));
-}
-
-const expect = chai.expect;
-chai.use(chaiAsPromised);
-chai.use(chaiSubset);
-
-export class MockCfg extends Configuration {
-
-    private conf = {
-        system: {
-            dirs: {
-                singletons: [dir("./test-services/singletons")],
-                alwaysnew: [dir("./test-services/alwaysnew")],
-                async: [dir("./test-services/async")],
-                throw: [dir("./test-services/throw")],
-                mixed: [dir("./test-services/mixed")],
-                throwasync: [dir("./test-services/throwasync")],
-                empty: [dir("./test-services/empty")]
-            }
-        },
-
-    }
-
-    public get(path: string[], defaultValue?: any): any {
-        return _.get(this.conf, path, defaultValue);
-    }
-}
-
-describe("Reflection tests", () => {
-    beforeEach(() => {
-        DI.clear();
-        DI.register(MockCfg).as(Configuration);
-
-        FooService.Counter = 0;
-    })
-
-    it("Should load services", () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.singletons")(target, "services");
-
-        expect(target.services).to.be.not.null;
-        expect(target.services).to.be.an("array").that.have.length(2);
-        expect(target.services[0]).to.include({
-            name: "FooService"
-        }).and.to.have.property("instance").not.null;
-    })
-
-    it("Should load services as singletons default", () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.singletons")(target, "services");
-
-        const services = target.services;
-        const cache = DI.RootContainer.Cache as any;
-
-        expect(services).to.be.an("array").that.have.length(2);
-        expect(cache).to.be.an("Map");
-        expect(cache.get("FooService")).to.not.null;
-        expect(cache.get("FooService2")).to.not.null;
-
-        expect(DI.resolve(FooService)).to.be.not.null;
-        expect(FooService.Counter).to.eq(1);
-
-        console.log(services);
-    })
-
-    it("Should load service async", async () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.async")(target, "services");
-
-        expect((target.services as any).then).to.be.instanceOf(Function);
-        expect(target.services).to.be.fulfilled.and.eventually.be.an("array");
-
-        const servs = await target.services;
-        expect(servs[0].name).to.eq("FooService");
-        expect(servs[0].instance.Counter).to.eq(1);
-    })
-
-    it("Should load mixed sync and async as async", async () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.mixed")(target, "services");
-
-        expect((target.services as any).then).to.be.instanceOf(Function);
-        expect(target.services).to.be.fulfilled.and.eventually.be.an("array");
-
-
-        const servs = await target.services;
-        expect(servs[0].name).to.eq("FooService");
-    })
-
-    it("Should throw when class not found", () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.throw")(target, "services");
-
-        expect(() => {
-            // tslint:disable-next-line: no-unused-expression-chai
-            target.services;
-        }).to.throw(IOException);
-    })
-
-    it("Should reject on async class not found", () => {
-        const target = {
-            services: [] as any[]
-        };
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.mixed")(target, "services");
-
-        expect((target.services as any).then).to.be.instanceOf(Function);
-        expect(target.services).to.be.rejected;
-
-    })
-
-
-    it("Should load service as new always", () => {
-
-        const target = {
-            services: [] as any[]
-        };
-
-        const target2 = {
-            services: [] as any[]
-        };
-
-
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.alwaysnew")(target, "services");
-        ResolveFromFiles("/**/*.{ts,js}", "system.dirs.alwaysnew")(target2, "services");
-
-        expect(target.services[0].instance.Counter).to.eq(1);
-        expect(target2.services[0].instance.Counter).to.eq(1);
-
-        expect(DI.RootContainer.Cache).to.be.an("Map");
-        expect(DI.RootContainer.Cache.get("FooService")).to.be.not.null;
-    })
-
-    it("Should list class from files", () => {
-
-        const target = {
-            services: [] as any[]
-        };
-
-
-        ListFromFiles("/**/*.{ts,js}", "system.dirs.alwaysnew")(target, "services");
-
-        expect(target.services).to.be.an("array");
-        expect(target.services[0].name).to.eq("FooService");
-        expect(target.services[0].instance).to.be.null;
-
-    })
-
-    it("should load empty array if args missing", ()=>{
-        const target = {
-            services: null as any[]
-        };
-
-        ListFromFiles("/**/*.{ts,js}", "fake.config.parameter")(target, "services");
-        expect(target.services).to.be.an("array").with.length(0);
-    })
-
-    it("should load empty array if directory is empty", ()=>{
-        const target = {
-            services: null as any[]
-        };
-
-        ListFromFiles("/**/*.{ts,js}", "system.dirs.empty")(target, "services");
-        expect(target.services).to.be.an("array").with.length(0);
-    })
-});

package/test/test-services/alwaysnew/FooService.ts

@@ -1,11 +0,0 @@
-import { NewInstance } from "@spinajs/di";
-
-@NewInstance()
-export class FooService {
-    public Counter = 0;
-
-    constructor() {
-        this.Counter++;
-    }
-
-}

package/test/test-services/async/FooService.ts

@@ -1,12 +0,0 @@
-import { AsyncResolveStrategy, IContainer } from "@spinajs/di";
-
-export class FooService extends AsyncResolveStrategy {
-
-    public Counter = 0;
-    
-    public resolveAsync(_: IContainer): Promise<void> {
-        this.Counter ++;
-        return Promise.resolve();
-    }
-
-}

package/test/test-services/async/FooService2.ts

@@ -1,9 +0,0 @@
-import { AsyncResolveStrategy, IContainer } from "@spinajs/di";
-
-export class FooService2 extends AsyncResolveStrategy {
-    
-    public resolveAsync(_: IContainer): Promise<void> {
-        return Promise.resolve();
-    }
-    
-}

package/test/test-services/mixed/FooService.ts

@@ -1,4 +0,0 @@
-export class FooService {
-   
-
-}

package/test/test-services/mixed/FooService2.ts

@@ -1,9 +0,0 @@
-import { AsyncResolveStrategy, IContainer } from "@spinajs/di";
-
-export class FooService2 extends AsyncResolveStrategy {
-    
-    public resolveAsync(_: IContainer): Promise<void> {
-        return Promise.resolve();
-    }
-    
-}

package/test/test-services/singletons/FooService.ts

@@ -1,7 +0,0 @@
-export class FooService {
-    public static Counter = 0;
-
-    constructor() {
-        FooService.Counter++;
-    }
-}

package/test/test-services/singletons/FooService2.ts

@@ -1,4 +0,0 @@
-export class FooService2
-{
-    
-}

package/test/test-services/throw/FooService.ts

@@ -1,3 +0,0 @@
-export class FooService222 {
-     
-}

package/test/test-services/throw/FooService2.ts

@@ -1,4 +0,0 @@
-export class FooService2
-{
-    
-}

package/test/test-services/throwasync/FooService.ts

@@ -1,9 +0,0 @@
-import { AsyncResolveStrategy, IContainer } from "@spinajs/di";
-
-export class FooService22 extends AsyncResolveStrategy {
-
-    public resolveAsync(_: IContainer): Promise<void> {
-        return Promise.resolve();
-    }
-
-}

package/test/test-services/throwasync/FooService2.ts

@@ -1,9 +0,0 @@
-import { AsyncResolveStrategy, IContainer } from "@spinajs/di";
-
-export class FooService2 extends AsyncResolveStrategy {
-    
-    public resolveAsync(_: IContainer): Promise<void> {
-        return Promise.resolve();
-    }
-    
-}

package/typedoc.json

@@ -1,16 +0,0 @@
-{
-    "mode": "modules",
-    "out": "docs",
-    "name": "spine",
-    "theme": "default",
-    "ignoreCompilerErrors": "true",
-    "experimentalDecorators": "true",
-    "emitDecoratorMetadata": "true",
-    "target": "ES6",
-    "moduleResolution": "node",
-    "preserveConstEnums": "true",
-    "stripInternal": "true",
-    "suppressExcessPropertyErrors": "true",
-    "suppressImplicitAnyIndexErrors": "true",
-    "module": "commonjs"
-  }