Extract config (#7)

 - Extracted SnConfig* Classes, they will be referenced from __sn-client-js__

Author: gallayl

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sn-client-cli",
-  "version": "1.0.0",
+  "version": "1.0.0-development-4",
   "description": "Command line tooling for Sense/NET ECM client",
   "main": "dist/index.js",
   "bin": {
@@ -13,7 +13,8 @@
     "dist_tests",
     "documentation",
     "src",
-    "test"
+    "test",
+    "sn.config.js"
   ],
   "scripts": {
     "pretest": "npm run build:tests",
@@ -24,8 +25,9 @@
     "build": "tsc",
     "build:tests": "tsc -p tsconfig.test.json",
     "typedoc": "gulp typedoc",
-    "tslint": "tslint --project tsconfig.json && tslint --project tsconfig.test.json",
-    "commit": "git-cz"
+    "tslint": "tslint --project tsconfig.json ./src/**/*.ts && tslint --project tsconfig.test.json ./test/**/*.ts",
+    "commit": "git-cz",
+    "publish:development": "npm publish --tag development"
   },
   "repository": {
     "type": "git",
@@ -46,19 +48,18 @@
   "homepage": "https://github.com/SenseNet/sn-client-cli#readme",
   "devDependencies": {
     "@types/chai": "^3.4.35",
+    "@types/mocha": "^2.2.40",
+    "@types/node": "^7.0.12",
     "chai": "^3.5.0",
     "commitizen": "^2.9.6",
     "mocha": "^3.2.0",
     "mocha-typescript": "^1.0.23",
     "prompt": "^1.0.0",
     "tslint": "^5.0.0",
     "typedoc": "^0.5.9",
-    "typescript": "^2.2.2"
+    "typescript": "^2.3.2"
   },
   "dependencies": {
-    "@types/chai": "^3.4.35",
-    "@types/mocha": "^2.2.40",
-    "@types/node": "^7.0.12",
     "adm-zip": "^0.4.7",
     "command-line-args": "^4.0.2",
     "command-line-commands": "^2.0.0",
@@ -71,7 +72,7 @@
     "gulp-run": "^1.7.1",
     "gulp-typedoc": "^2.0.2",
     "path": "^0.12.7",
-    "sn-client-js": "^1.1.1-beta.1"
+    "sn-client-js": "1.1.1-development.3"
   },
   "czConfig": {
     "path": "node_modules/cz-conventional-changelog"

src/help.ts

@@ -1,5 +1,5 @@
 import * as CommandLineUsage from 'command-line-usage';
-import { SnConfigFieldModel } from "./utils/snconfig/snconfigfieldmodel";
+import { Config } from "sn-client-js";
 
 /**
  * This class will be used to display help information on 'help' command or when the user enters invalit runtime arguments
@@ -10,7 +10,7 @@ export class Help {
      * Displays the help info.
      * @param validOptions {SnConfigFieldModel[]} The valid option values from the SnConfigModel
      */
-    public static Show(validOptions: SnConfigFieldModel[]) {
+    public static Show(validOptions: Config.SnConfigFieldModel[]) {
         const definitionDocs = [
             {
                 header: 'SN-Client-CLI',

src/index.ts

@@ -2,12 +2,12 @@ import * as CommadLineArgs from 'command-line-args';
 import * as CommandLineCommands from 'command-line-commands';
 import * as FileSystem from 'fs';
 import * as Path from 'path';
+import { Config } from 'sn-client-js';
 import { Help } from './help';
 import { DoInitializeConfigs } from './initialize-config';
 import { Initializer } from './initializer';
 import { DoFetchTypes } from './sn-fetch-types';
-import { SnConfigFieldModelStore } from './utils/snconfig/snconfigfieldmodelstore';
-import { SnConfigModel } from "./utils/snconfig/snconfigmodel";
+import { SnCliConfigModel } from "./utils/snconfig/snconfigmodel";
 
 /**
  * Entry point for the 'sn-client' command
@@ -35,11 +35,13 @@ const Start = async () => {
     }
 
     const validCommands = [CMD_INIT, CMD_FETCH_TYPES, CMD_HELP];
-    const validOptions = SnConfigFieldModelStore.GetCommandOptions();
+    const validOptions = Config.SnConfigFieldModelStore.GetCommandOptions();
 
     try {
         const { command } = CommandLineCommands(validCommands);
-        const options: Partial<SnConfigModel> = CommadLineArgs(validOptions.map((op) => {
+        const options: Partial<SnCliConfigModel> = CommadLineArgs(validOptions
+            .filter((op) => op.StoreKey.indexOf(SnCliConfigModel.name) === 0)
+            .map((op) => {
             return {
                 name: op.FieldName
             };

src/initializer.ts

@@ -1,5 +1,6 @@
 import * as Path from 'path';
 import { PathHelper } from "./utils/pathhelper";
+import { SnCliConfigModel } from "./utils/snconfig/snconfigmodel";
 import { SnConfigReader } from "./utils/snconfig/snconfigreader";
 import { Stage } from "./utils/stage";
 
@@ -25,8 +26,8 @@ export class Initializer {
         return this.pathHelper;
     }
 
-    private configReader: SnConfigReader;
-    public get SnConfigReader(): SnConfigReader {
+    private configReader: SnConfigReader<SnCliConfigModel>;
+    public get SnConfigReader(): SnConfigReader<SnCliConfigModel> {
         return this.configReader;
     }
 
@@ -37,7 +38,7 @@ export class Initializer {
             `${process.cwd()}${Path.sep}node_modules${Path.sep}sn-client-cli`);
         this.stage = new Stage(this.pathHelper);
         await this.stage.PrepareAsync();
-        this.configReader = new SnConfigReader(this.pathHelper.PackageRootPath);
+        this.configReader = new SnConfigReader(SnCliConfigModel, this.pathHelper.PackageRootPath);
         this.configReader.ReadConfigFile();
     }
 }

src/utils/ask.ts

@@ -1,7 +1,6 @@
 import * as Prompt from 'prompt';
-import { SnConfigBehavior } from "./snconfig/snconfigbehavior";
-import { SnConfigFieldModelStore } from './snconfig/snconfigfieldmodelstore';
-import { SnConfigModel } from './snconfig/snconfigmodel';
+import { Config } from "sn-client-js";
+import { SnCliConfigModel } from './snconfig/snconfigmodel';
 
 /**
  * This class is a wrapper for command-line data input in Node.Js console applications
@@ -47,10 +46,10 @@ export class Ask {
     }
 
     public static createPromptQuestionFromConfigName(fieldName: string) {
-        const cfg = SnConfigFieldModelStore.Get(fieldName);
+        const cfg = Config.SnConfigFieldModelStore.Get(fieldName);
         return {
             description: cfg.Question,   // ??
-            hidden: cfg.Behavior | SnConfigBehavior.HideConsoleInput,
+            hidden: cfg.Behavior | Config.SnConfigBehavior.HideConsoleInput,
             name: cfg.FieldName,
         };
     }
@@ -59,8 +58,8 @@ export class Ask {
      * Asks about a list of provided config values
      * @param missingConfigs {K[]} A keys from SnConfigModel's fields which has to be asked
      */
-    public static async MissingConfigs<K extends keyof SnConfigModel>(...missingConfigs: K[]): Promise<Partial<SnConfigModel>> {
-        return new Promise<Partial<SnConfigModel>>((resolve, reject) => {
+    public static async MissingConfigs<K extends keyof SnCliConfigModel>(...missingConfigs: K[]): Promise<Partial<SnCliConfigModel>> {
+        return new Promise<Partial<SnCliConfigModel>>((resolve, reject) => {
             Prompt.start();
             const configs = missingConfigs.map((cfg) => {
                 this.createPromptQuestionFromConfigName(cfg);

src/utils/download.ts

@@ -53,9 +53,12 @@ export class Download {
      */
     public async GetAsBufferAsync(): Promise<Buffer> {
         return new Promise<Buffer>((resolve) => {
+
+            const url = new URL(this.host);
+
             Http.get({
                 headers: this.headers,
-                host: this.host,
+                host: url.origin,
                 path: this.path,
             }, (response: Http.IncomingMessage) => this.HandleResponse(response, resolve));
         });