@nestia/sdk 2.0.0-dev.20230991 → 2.0.1

package/src/utils/ImportDictionary.ts

@@ -4,20 +4,18 @@ import { HashSet } from "tstl/container/HashSet";
 import { Pair } from "tstl/utility/Pair";
 
 export class ImportDictionary {
-    private readonly externals_: HashMap<Pair<string, boolean>, IComposition> =
-        new HashMap();
-    private readonly internals_: HashMap<Pair<string, boolean>, IComposition> =
+    private readonly components_: HashMap<Pair<string, boolean>, IComposition> =
         new HashMap();
 
     public empty(): boolean {
-        return this.internals_.empty() && this.externals_.empty();
+        return this.components_.empty();
     }
 
     public external(props: ImportDictionary.IExternalProps): string {
-        const composition: IComposition = this.externals_.take(
+        const composition: IComposition = this.components_.take(
             new Pair(props.library, props.type),
             () => ({
-                location: props.library,
+                location: `node_modules/${props.library}`,
                 elements: new HashSet(),
                 default: false,
                 type: props.type,
@@ -36,7 +34,7 @@ export class ImportDictionary {
                 return props.file.substring(0, props.file.length - 3);
             return props.file;
         })();
-        const composition: IComposition = this.internals_.take(
+        const composition: IComposition = this.components_.take(
             new Pair(file, props.type),
             () => ({
                 location: file,
@@ -53,12 +51,26 @@ export class ImportDictionary {
     }
 
     public toScript(outDir: string): string {
-        const statements: string[] = [];
+        const external: string[] = [];
+        const internal: string[] = [];
+
+        const locator = (str: string) => {
+            const location: string = path
+                .relative(outDir, str)
+                .split("\\")
+                .join("/");
+            const index: number = location.lastIndexOf(NODE_MODULES);
+            return index === -1
+                ? location.startsWith("..")
+                    ? location
+                    : `./${location}`
+                : location.substring(index + NODE_MODULES.length);
+        };
         const enroll =
-            (locator: (str: string) => string) =>
-            (dict: HashMap<Pair<string, boolean>, IComposition>) => {
-                const compositions: IComposition[] = dict
+            (filter: (str: string) => boolean) => (container: string[]) => {
+                const compositions: IComposition[] = this.components_
                     .toJSON()
+                    .filter((c) => filter(c.second.location))
                     .map((e) => ({
                         ...e.second,
                         location: locator(e.second.location),
@@ -74,7 +86,7 @@ export class ImportDictionary {
                                 .sort((a, b) => a.localeCompare(b))
                                 .join(", ")} }`,
                         );
-                    statements.push(
+                    container.push(
                         `import ${c.type ? "type " : ""}${brackets.join(
                             ", ",
                         )} from "${c.location}";`,
@@ -82,20 +94,11 @@ export class ImportDictionary {
                 }
             };
 
-        enroll((str) => str)(this.externals_);
-        if (!this.externals_.empty() && !this.internals_.empty())
-            statements.push("");
-        enroll((str) => {
-            const location: string = path
-                .relative(outDir, str)
-                .split("\\")
-                .join("/");
-            const index: number = location.lastIndexOf(NODE_MODULES);
-            return index === -1
-                ? `./${location}`
-                : location.substring(index + NODE_MODULES.length);
-        })(this.internals_);
-        return statements.join("\n");
+        enroll((str) => str.indexOf(NODE_MODULES) !== -1)(external);
+        enroll((str) => str.indexOf(NODE_MODULES) === -1)(internal);
+
+        if (external.length && internal.length) external.push("");
+        return [...external, ...internal].join("\n");
     }
 }
 export namespace ImportDictionary {

package/lib/executable/internal/NestiaConfigCompilerOptions.d.ts

@@ -1,12 +0,0 @@
-export declare namespace NestiaConfigCompilerOptions {
-    const DEFAULT_OPTIONS: {
-        target: string;
-        module: string;
-        strictNullChecks: boolean;
-        types: string[];
-        noEmit: boolean;
-        esModuleInterop: boolean;
-        experimentalDecorators: boolean;
-        emitDecoratorMetadata: boolean;
-    };
-}

package/lib/executable/internal/NestiaConfigCompilerOptions.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NestiaConfigCompilerOptions = void 0;
-var NestiaConfigCompilerOptions;
-(function (NestiaConfigCompilerOptions) {
-    /* -----------------------------------------------------------
-        DEFAULT VALUES
-    ----------------------------------------------------------- */
-    const ESSENTIAL_OPTIONS = {
-        types: ["node", "reflect-metadata"],
-        noEmit: true,
-        esModuleInterop: true,
-        experimentalDecorators: true,
-        emitDecoratorMetadata: true,
-    };
-    NestiaConfigCompilerOptions.DEFAULT_OPTIONS = Object.assign(Object.assign({}, ESSENTIAL_OPTIONS), { target: "es5", module: "commonjs", strictNullChecks: true });
-})(NestiaConfigCompilerOptions || (exports.NestiaConfigCompilerOptions = NestiaConfigCompilerOptions = {}));
-//# sourceMappingURL=NestiaConfigCompilerOptions.js.map

package/lib/executable/internal/NestiaConfigCompilerOptions.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NestiaConfigCompilerOptions.js","sourceRoot":"","sources":["../../../src/executable/internal/NestiaConfigCompilerOptions.ts"],"names":[],"mappings":";;;AAAA,IAAiB,2BAA2B,CAkB3C;AAlBD,WAAiB,2BAA2B;IACxC;;kEAE8D;IAC9D,MAAM,iBAAiB,GAAG;QACtB,KAAK,EAAE,CAAC,MAAM,EAAE,kBAAkB,CAAC;QACnC,MAAM,EAAE,IAAI;QACZ,eAAe,EAAE,IAAI;QACrB,sBAAsB,EAAE,IAAI;QAC5B,qBAAqB,EAAE,IAAI;KAC9B,CAAC;IAEW,2CAAe,mCACrB,iBAAiB,KACpB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,UAAU,EAClB,gBAAgB,EAAE,IAAI,GACzB,CAAC;AACN,CAAC,EAlBgB,2BAA2B,2CAA3B,2BAA2B,QAkB3C"}

package/lib/executable/internal/NestiaSdkConfig.d.ts

@@ -1,4 +0,0 @@
-import { INestiaConfig } from "../../INestiaConfig";
-export declare namespace NestiaSdkConfig {
-    function get(): Promise<INestiaConfig | null>;
-}