Updated simplr-validation package structure with building (#42)

Martynas Žilinskas · web-flow · commit 1c0fced81c1e · 2017-05-10T19:34:02.000+03:00
diff --git a/packages/simplr-validation/.gitignore b/packages/simplr-validation/.gitignore
@@ -1,3 +1,5 @@
 dist
 @types
 coverage
+*.js
+**/*.d.ts
diff --git a/packages/simplr-validation/__tests__/subscribers/form-store-subscriber.test.tsx b/packages/simplr-validation/__tests__/subscribers/form-store-subscriber.test.tsx
@@ -6,13 +6,13 @@ import {
     FieldStateProps,
     FormStateProps,
     FieldValidationType
-} from "simplr-forms-core/contracts";
-import { FormStore } from "simplr-forms-core/stores";
+} from "simplr-forms/contracts";
+import { FormStore } from "simplr-forms/stores";
 import {
     FieldRegistered,
     FieldPropsChanged,
     ValueChanged,
-} from "simplr-forms-core/actions";
+} from "simplr-forms/actions";
 
 import { BaseFormValidator, BaseFormValidatorProps } from "../../src/abstractions/base-form-validator";
 import { ValidationResult } from "../../src/contracts";
diff --git a/packages/simplr-validation/__tests__/subscribers/form-stores-handler-subscriber.test.ts b/packages/simplr-validation/__tests__/subscribers/form-stores-handler-subscriber.test.ts
@@ -1,5 +1,5 @@
-import { FSHContainer, FormStoresHandler } from "simplr-forms-core/stores";
-import { FormRegistered, FormUnregistered } from "simplr-forms-core/actions";
+import { FSHContainer, FormStoresHandler } from "simplr-forms/stores";
+import { FormRegistered, FormUnregistered } from "simplr-forms/actions";
 import * as Sinon from "sinon";
 
 import { FormStoresHandlerSubscriber } from "../../src/subscribers/form-stores-handler-subscriber";
diff --git a/packages/simplr-validation/package.json b/packages/simplr-validation/package.json
@@ -15,20 +15,27 @@
     "watch": "webpack -w",
     "release": "npm run build && npm run uglifyjs",
     "tslint": "tslint --config ./tslint.json --project . --exclude __tests__/**/* && echo TsLint test successfully passed.",
-    "uglifyjs": "uglifyjs ./dist/simplr-forms-core.js -o ./dist/simplr-forms-core.min.js --compress --mangle"
+    "uglifyjs": "echo \"Uglify is not implemented\" && exit 1",
+    "gulp-build": "tsc -p ./tools/tsconfig.gulp.json",
+    "gulp-watch": "npm run gulp-build -- -w"
   },
   "license": "AGPL-3.0",
   "files": [
-    "dist",
-    "@types",
     "**/*.md",
     "*.js",
-    "!*.config.js"
+    "**/*.d.ts",
+    "!*.config.js",
+    "!gulpfile.js",
+    "!node_modules/**"
   ],
   "devDependencies": {
+    "@types/gulp": "^4.0.2",
+    "@types/webpack": "^2.2.15",
     "@types/enzyme": "^2.7.7",
     "@types/jest": "^19.2.2",
     "@types/sinon": "^2.1.2",
+    "gulp": "github:gulpjs/gulp#4.0",
+    "simplr-mvdir": "0.0.1-beta.7",
     "enzyme": "^2.8.2",
     "jest": "^19.0.2",
     "jest-enzyme": "^3.0.1",
@@ -49,7 +56,7 @@
     "action-emitter": "^0.2.1",
     "immutable": "^3.8.1",
     "react": "^15.5.4",
-    "simplr-forms-core": "4.0.0-pre-alpha.18",
+    "simplr-forms": "4.0.0-pre-alpha.20",
     "validator": "^7.0.0"
   },
   "jest": {
diff --git a/packages/simplr-validation/src/abstractions.ts b/packages/simplr-validation/src/abstractions.ts
@@ -0,0 +1 @@
+export * from "./abstractions";
diff --git a/packages/simplr-validation/src/abstractions/base-validator.ts b/packages/simplr-validation/src/abstractions/base-validator.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { Validator, ValidationResult, ValidationError } from "../contracts";
 
diff --git a/packages/simplr-validation/src/abstractions/index.ts b/packages/simplr-validation/src/abstractions/index.ts
@@ -1 +1,3 @@
 export * from "./base-field-validator";
+export * from "./base-form-validator";
+export * from "./base-validator";
diff --git a/packages/simplr-validation/src/contracts.ts b/packages/simplr-validation/src/contracts.ts
@@ -1,4 +1,4 @@
-import { FormError } from "simplr-forms-core/contracts";
+import { FormError } from "simplr-forms/contracts";
 
 export interface Validator {
     Validate(value: any): ValidationResult;
diff --git a/packages/simplr-validation/src/index.ts b/packages/simplr-validation/src/index.ts
@@ -1,14 +1 @@
-import * as Abstractions from "./abstractions/index";
-import * as Contracts from "./contracts";
-import * as Validators from "./validators/index";
-import * as Subscribers from "./subscribers/index";
-
-const { Subscriber } = Subscribers;
-
-export {
-    Abstractions,
-    Contracts,
-    Validators,
-    Subscribers,
-    Subscriber
-};
+export * from "./validators/index";
diff --git a/packages/simplr-validation/src/subscribers.ts b/packages/simplr-validation/src/subscribers.ts
@@ -0,0 +1 @@
+export * from "./subscribers/index";
diff --git a/packages/simplr-validation/src/subscribers/form-store-subscriber.ts b/packages/simplr-validation/src/subscribers/form-store-subscriber.ts
@@ -4,13 +4,13 @@ import * as ActionEmitter from "action-emitter";
 import {
     FieldValue,
     FieldValidationType
-} from "simplr-forms-core/contracts";
-import { FormStore } from "simplr-forms-core/stores";
+} from "simplr-forms/contracts";
+import { FormStore } from "simplr-forms/stores";
 import {
     FieldRegistered,
     ValueChanged,
     FieldPropsChanged
-} from "simplr-forms-core/actions";
+} from "simplr-forms/actions";
 
 import { ValidateField, ValidateForm } from "../utils/validation";
 
diff --git a/packages/simplr-validation/src/subscribers/form-stores-handler-subscriber.ts b/packages/simplr-validation/src/subscribers/form-stores-handler-subscriber.ts
@@ -1,5 +1,5 @@
-import { FSHContainerClass, FSHContainer } from "simplr-forms-core/stores";
-import { FormRegistered, FormUnregistered } from "simplr-forms-core/actions";
+import { FSHContainerClass, FSHContainer } from "simplr-forms/stores";
+import { FormRegistered, FormUnregistered } from "simplr-forms/actions";
 import * as ActionEmitter from "action-emitter";
 import * as Immutable from "immutable";
 import { FormStoreSubscriber } from "./form-store-subscriber";
diff --git a/packages/simplr-validation/src/subscribers/index.ts b/packages/simplr-validation/src/subscribers/index.ts
@@ -1,9 +1,3 @@
-import * as FormStoresHandlerSubscriber from "./form-stores-handler-subscriber";
-import * as FormStoreSubscriber from "./form-store-subscriber";
-import * as Subscriber from "./subscriber";
-
-export {
-    FormStoresHandlerSubscriber,
-    FormStoreSubscriber,
-    Subscriber
-};
+export * from "./form-stores-handler-subscriber";
+export * from "./form-store-subscriber";
+export * from "./subscriber";
diff --git a/packages/simplr-validation/src/utils.ts b/packages/simplr-validation/src/utils.ts
@@ -0,0 +1 @@
+export * from "./utils/index";
diff --git a/packages/simplr-validation/src/utils/index.ts b/packages/simplr-validation/src/utils/index.ts
@@ -0,0 +1 @@
+export * from "./validation";
diff --git a/packages/simplr-validation/src/utils/validation.ts b/packages/simplr-validation/src/utils/validation.ts
@@ -1,5 +1,5 @@
-import { FieldValue } from "simplr-forms-core/contracts";
-import { ProcessValue } from "simplr-forms-core/utils";
+import { FieldValue } from "simplr-forms/contracts";
+import { ProcessValue } from "simplr-forms/utils";
 
 import { Validator, FIELD_VALIDATOR_FUNCTION_NAME, FORM_VALIDATOR_FUNCTION_NAME } from "../contracts";
 
diff --git a/packages/simplr-validation/src/validators/alpha.ts b/packages/simplr-validation/src/validators/alpha.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/alphanumeric.ts b/packages/simplr-validation/src/validators/alphanumeric.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/ascii.ts b/packages/simplr-validation/src/validators/ascii.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/base64.ts b/packages/simplr-validation/src/validators/base64.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/boolean.ts b/packages/simplr-validation/src/validators/boolean.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/byte-length.ts b/packages/simplr-validation/src/validators/byte-length.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/contains.ts b/packages/simplr-validation/src/validators/contains.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/credit-card.ts b/packages/simplr-validation/src/validators/credit-card.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/currency.ts b/packages/simplr-validation/src/validators/currency.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/equals.ts b/packages/simplr-validation/src/validators/equals.ts
@@ -1,5 +1,5 @@
 import * as Validator from "validator";
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
diff --git a/packages/simplr-validation/src/validators/required.ts b/packages/simplr-validation/src/validators/required.ts
@@ -1,7 +1,7 @@
 import { BaseFieldValidator, BaseFieldValidatorProps } from "../abstractions/base-field-validator";
 import { ValidationResult } from "../contracts";
 
-import { FieldValue } from "simplr-forms-core/contracts";
+import { FieldValue } from "simplr-forms/contracts";
 
 export interface RequiredValidatorProps extends BaseFieldValidatorProps { }
 
diff --git a/packages/simplr-validation/tools/gulpfile.ts b/packages/simplr-validation/tools/gulpfile.ts
@@ -0,0 +1,58 @@
+import * as gulp from "gulp";
+import * as path from "path";
+import * as webpack from "webpack";
+import * as webpackConfig from "./webpack.config";
+import * as process from "process";
+import * as childProcess from "child_process";
+import * as simplrMvDir from "simplr-mvdir";
+
+const packageJson = require("./package.json");
+
+const compiler = webpack(webpackConfig);
+const paths = {
+    src: [
+        "./src",
+        "./tsconfig.json"
+    ],
+    dist: "./dist",
+    root: "."
+};
+
+export function webpackTask() {
+    return new Promise((resolve, reject) => {
+        compiler.run((err, stats) => {
+            if (err != null) {
+                reject(err);
+                return;
+            }
+            resolve();
+        });
+    });
+}
+
+export async function moveFromDistTask() {
+    const from = path.resolve(paths.dist);
+    const to = path.resolve(paths.root);
+    await simplrMvDir.move(from, to);
+}
+
+export async function copyToJspm() {
+    const jspmPath = `../simplr-forms-test/dist/jspm_packages/npm/${packageJson.name}@${packageJson.version}`;
+    const outputPath = path.resolve(jspmPath);
+    gulp.src(packageJson.files)
+        .pipe(gulp.dest(outputPath));
+}
+
+const buildTask = gulp.series(webpackTask, moveFromDistTask);
+
+export function watchStartTask() {
+    gulp.watch(paths.src, gulp.series(buildTask, copyToJspm));
+}
+
+export const build = buildTask;
+export const watch = gulp.series(buildTask, copyToJspm, watchStartTask);
+
+
+
+// tslint:disable-next-line:no-default-export
+export default buildTask;
diff --git a/packages/simplr-validation/tools/tsconfig.gulp.json b/packages/simplr-validation/tools/tsconfig.gulp.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "removeComments": false,
+        "rootDir": ".",
+        "outDir": "../",
+        "jsx": "react",
+        "sourceMap": false,
+        "skipDefaultLibCheck": true,
+        "declaration": false,
+        "pretty": true,
+        "strict": true,
+        "lib": [
+            "dom",
+            "dom.iterable",
+            "es6"
+        ]
+    },
+    "exclude": [
+        "node_modules",
+        "dist",
+        "@types",
+        "__tests__"
+    ]
+}
diff --git a/packages/simplr-validation/tools/webpack.config.ts b/packages/simplr-validation/tools/webpack.config.ts
diff --git a/packages/simplr-validation/tsconfig.json b/packages/simplr-validation/tsconfig.json
diff --git a/packages/simplr-validation/webpack.config.js b/packages/simplr-validation/webpack.config.js

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 dist
 @types
 coverage
 +*.js
 +**/*.d.ts
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`export * from "./base-field-validator";`
	`2`	`+export * from "./base-form-validator";`
	`3`	`+export * from "./base-validator";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { FormError } from "simplr-forms-core/contracts";`
	`1`	`+import { FormError } from "simplr-forms/contracts";`
`2`	`2`
`3`	`3`	`export interface Validator {`
`4`	`4`	`Validate(value: any): ValidationResult;`