simplr-forms-core packing updated to expose a convenient interface.

DovydasNavickas · DovydasNavickas · commit 17249a047ec8 · 2017-04-25T22:04:41.000+03:00
dist -&gt; top level files moving implemented with a required externals resolving.
diff --git a/packages/simplr-forms-core/package.json b/packages/simplr-forms-core/package.json
@@ -33,6 +33,7 @@
     "enzyme": "^2.8.2",
     "jest": "^19.0.2",
     "jest-enzyme": "^3.0.1",
+    "on-build-webpack": "^0.1.0",
     "react-dom": "^15.5.4",
     "react-test-renderer": "^15.5.4",
     "sinon": "^2.1.0",
diff --git a/packages/simplr-forms-core/src/abstractions.ts b/packages/simplr-forms-core/src/abstractions.ts
@@ -0,0 +1 @@
+export * from "./abstractions/index";
diff --git a/packages/simplr-forms-core/src/abstractions/base-container.ts b/packages/simplr-forms-core/src/abstractions/base-container.ts
@@ -0,0 +1,54 @@
+import * as React from "react";
+import * as PropTypes from "prop-types";
+
+import { FormStore } from "../stores/form-store";
+import { StateUpdated } from "../actions/form-store";
+import { FSHContainer } from "../stores/form-stores-handler";
+
+export interface BaseContainerProps {
+    formId: string;
+}
+
+export interface BaseContainerParentContext {
+    FormId: string;
+}
+
+export abstract class BaseContainer<TProps extends BaseContainerProps, TState> extends React.Component<TProps, TState> {
+    context: BaseContainerParentContext;
+
+    static contextTypes: PropTypes.ValidationMap<BaseContainerParentContext> = {
+        FormId: PropTypes.string.isRequired
+    };
+
+    protected get FormId(): string {
+        if (this.props.formId == null) {
+            return this.props.formId;
+        }
+        if (this.context.FormId != null) {
+            return this.context.FormId;
+        }
+
+        // Should never happen as componentWillMount handles this situation
+        throw new Error(`simplr-forms-core: form id is not present neither in props, nor in context.`);
+    }
+
+    protected get FormStore(): FormStore {
+        return FSHContainer.FormStoresHandler.GetStore(this.FormId);
+    }
+
+    componentWillMount() {
+        if (this.props.formId == null && this.context.FormId == null) {
+            throw new Error("simplr-forms-core: Container must be in a Form or have prop 'formId' set.");
+        }
+
+
+        if (this.props.formId != null && this.context.FormId != null) {
+            const but = `but form id was defined: '${this.props.formId}'`;
+            throw new Error(`simplr-forms-core: Container is already in a Form '${this.context.FormId}' context, ${but}.`);
+        }
+
+        this.FormStore.addListener(StateUpdated, this.OnStoreUpdated.bind(this));
+    }
+
+    protected abstract OnStoreUpdated(): void;
+}
diff --git a/packages/simplr-forms-core/src/abstractions/index.ts b/packages/simplr-forms-core/src/abstractions/index.ts
@@ -1,2 +1,3 @@
 export * from "./base-field";
 export * from "./base-form";
+export * from "./base-container";
diff --git a/packages/simplr-forms-core/src/actions.ts b/packages/simplr-forms-core/src/actions.ts
@@ -0,0 +1 @@
+export * from "./actions/index";
diff --git a/packages/simplr-forms-core/src/contracts.ts b/packages/simplr-forms-core/src/contracts.ts
@@ -0,0 +1 @@
+export * from "./contracts/index";
diff --git a/packages/simplr-forms-core/src/index.ts b/packages/simplr-forms-core/src/index.ts
@@ -1,13 +1 @@
-import * as Abstractions from "./abstractions/index";
-import * as Actions from "./actions/index";
-import * as Contracts from "./contracts/index";
-import * as Stores from "./stores/index";
-import * as Utils from "./utils/index";
-
-export {
-    Abstractions,
-    Actions,
-    Contracts,
-    Stores,
-    Utils
-};
+export * from "./abstractions/index";
diff --git a/packages/simplr-forms-core/src/stores.ts b/packages/simplr-forms-core/src/stores.ts
@@ -0,0 +1 @@
+export * from "./stores/index";
diff --git a/packages/simplr-forms-core/src/utils.ts b/packages/simplr-forms-core/src/utils.ts
@@ -0,0 +1 @@
+export * from "./utils/index";
diff --git a/packages/simplr-forms-core/tsconfig.json b/packages/simplr-forms-core/tsconfig.json
@@ -9,7 +9,6 @@
         "sourceMap": false,
         "skipDefaultLibCheck": true,
         "declaration": true,
-        "declarationDir": "@types",
         "pretty": true,
         "strict": true,
         "lib": [
diff --git a/packages/simplr-forms-core/webpack.config.js b/packages/simplr-forms-core/webpack.config.js
@@ -1,15 +1,91 @@
 const packageJson = require("./package.json");
+const path = require("path");
+
+var WebpackOnBuildPlugin = require('on-build-webpack');
+var childProcess = require('child_process');
 
 let externals = {};
 
 for (let key in packageJson.dependencies) {
     externals[key] = key;
 }
 
+let externalsResolver = [
+    externals,
+    function (context, request, callback) {
+        const directoriesToTest = [
+            "abstractions",
+            "actions",
+            "stores",
+            "utils"
+        ];
+
+        const tests = directoriesToTest.map(directory => ({
+            regex: new RegExp(`.*/${directory}/.+$`),
+            directory: directory
+        }));
+
+        let passingTest;
+        for (const test of tests) {
+            if (test.regex.test(request)) {
+                passingTest = test;
+            }
+        }
+
+        if (passingTest != null) {
+            const resolvedPath = path.resolve(context, request);
+            const shouldReplaceWithCustomResolve =
+                request.indexOf("src") === -1 &&
+                resolvedPath.indexOf(path.join(__dirname, `src/${passingTest.directory}`)) !== -1;
+
+            if (shouldReplaceWithCustomResolve) {
+                const customResolve = `./${passingTest.directory}`;
+                callback(null, customResolve);
+                return;
+            }
+        }
+        callback();
+    }
+];
+
+async function runScript(path, args) {
+    return new Promise((resolve, reject) => {
+        let invoked = false;
+
+        const process = childProcess.fork(path, args);
+
+        process.on("error", err => {
+            if (invoked) {
+                return;
+            }
+            invoked = true;
+            reject(err);
+        });
+
+        process.on("exit", code => {
+            if (invoked) {
+                return;
+            }
+            invoked = true;
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(`Exit code: ${code}`));
+        });
+    });
+}
+
 module.exports = {
-    entry: "./src/index.ts",
+    entry: {
+        main: "./src/index.ts",
+        abstractions: "./src/abstractions/index.ts",
+        stores: "./src/stores/index.ts",
+        actions: "./src/actions/index.ts",
+        utils: "./src/utils/index.ts"
+    },
     output: {
-        filename: "./dist/simplr-forms-core.js",
+        filename: "./dist/[name].js",
         libraryTarget: "umd"
     },
     module: {
@@ -25,5 +101,10 @@ module.exports = {
     resolve: {
         extensions: [".ts", ".tsx"]
     },
-    externals: externals
+    externals: externalsResolver,
+    plugins: [
+        new WebpackOnBuildPlugin(async (stats) => {
+            await runScript("../simplr-mvdir/dist/cli.js", ["--from", "dist", "--to", "."]);
+        }),
+    ]
 };
diff --git a/packages/simplr-forms-dom/package.json b/packages/simplr-forms-dom/package.json
@@ -36,6 +36,7 @@
     "mkdirp": "^0.5.1",
     "mv": "^2.1.1",
     "mz": "^2.6.0",
+    "on-build-webpack": "^0.1.0",
     "simplr-mvdir": "0.0.1-beta.6",
     "sinon": "^2.1.0",
     "ts-jest": "^19.0.8",
@@ -61,4 +62,4 @@
       "js"
     ]
   }
-}
+}
diff --git a/packages/simplr-forms-dom/src/components/form.tsx b/packages/simplr-forms-dom/src/components/form.tsx
@@ -1,12 +1,11 @@
 import * as React from "react";
 import { Abstractions as CoreAbstractions, Contracts as CoreContracts } from "simplr-forms-core";
+import { OnChangeCallback } from "../contracts/field";
+import { FormOnSubmitCallback } from "../contracts/form";
 
-export interface Props extends CoreContracts.FormProps, React.HTMLProps<HTMLFormElement> {
-
-}
-
-export interface FormProps extends Props {
-
+export interface FormProps extends CoreContracts.FormProps, React.HTMLProps<HTMLFormElement> {
+    onSubmit?: FormOnSubmitCallback;
+    onChange?: OnChangeCallback<any>;
 }
 
 export class Form extends CoreAbstractions.BaseForm<FormProps, {}> {
diff --git a/packages/simplr-forms-dom/src/components/text.tsx b/packages/simplr-forms-dom/src/components/text.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { Contracts as CoreContracts } from "simplr-forms-core";
+import { FieldProps, FieldValue } from "simplr-forms-core/contracts";
 
 import { BaseDomField, BaseDomFieldState } from "../abstractions/base-dom-field";
 import { OnChangeCallback } from "../contracts/field";
@@ -12,7 +12,7 @@ import { OnChangeCallback } from "../contracts/field";
  * @extends {CoreContracts.FieldProps}
  * @extends {React.HTMLProps<HTMLInputElement>}
  */
-export interface TextProps extends CoreContracts.FieldProps, React.HTMLProps<HTMLInputElement> {
+export interface TextProps extends FieldProps, React.HTMLProps<HTMLInputElement> {
     name: string;
     onFocus?: React.EventHandler<React.FocusEvent<HTMLInputElement>>;
     onBlur?: React.EventHandler<React.FocusEvent<HTMLInputElement>>;
@@ -21,7 +21,7 @@ export interface TextProps extends CoreContracts.FieldProps, React.HTMLProps<HTM
 }
 
 export class Text extends BaseDomField<TextProps, BaseDomFieldState> {
-    protected GetValueFromEvent(event: React.FormEvent<HTMLInputElement>): CoreContracts.FieldValue {
+    protected GetValueFromEvent(event: React.FormEvent<HTMLInputElement>): FieldValue {
         return event.currentTarget.value;
     }
 
@@ -38,14 +38,14 @@ export class Text extends BaseDomField<TextProps, BaseDomFieldState> {
     }
 
 
-    protected get RawInitialValue(): CoreContracts.FieldValue {
+    protected get RawInitialValue(): FieldValue {
         if (this.props != null && this.props.value != null) {
             return this.props.value;
         }
         return this.DefaultValue;
     }
 
-    protected get DefaultValue(): CoreContracts.FieldValue {
+    protected get DefaultValue(): FieldValue {
         if (this.props != null && this.props.defaultValue != null) {
             return this.props.defaultValue;
         }
diff --git a/packages/simplr-forms-dom/webpack.config.js b/packages/simplr-forms-dom/webpack.config.js
@@ -2,6 +2,9 @@ const packageJson = require("./package.json");
 const tsConfig = require("./tsconfig.json");
 const path = require("path");
 
+var WebpackOnBuildPlugin = require('on-build-webpack');
+var childProcess = require('child_process');
+
 let externals = {};
 
 for (let key in packageJson.dependencies) {
@@ -26,10 +29,38 @@ let externalsResolver = [
     }
 ];
 
+async function runScript(path, args) {
+    return new Promise((resolve, reject) => {
+        let invoked = false;
+
+        const process = childProcess.fork(path, args);
+
+        process.on("error", err => {
+            if (invoked) {
+                return;
+            }
+            invoked = true;
+            reject(err);
+        });
+
+        process.on("exit", code => {
+            if (invoked) {
+                return;
+            }
+            invoked = true;
+            if (code === 0) {
+                resolve();
+                return;
+            }
+            reject(new Error(`Exit code: ${code}`));
+        });
+    });
+}
+
 module.exports = {
     entry: {
-        abstractions: "./src/abstractions/index.ts",
-        main: "./src/index.ts"
+        main: "./src/index.ts",
+        abstractions: "./src/abstractions/index.ts"
     },
     output: {
         filename: "./dist/[name].js",
@@ -38,7 +69,11 @@ module.exports = {
     module: {
         rules: [
             {
-                test: /\.tsx?$/,
+                test: /.+\.tsx?$/,
+                exclude: [
+                    /!.+\/src.+/,
+                    /\.d\.ts$/
+                ],
                 loader: "ts-loader",
                 options: {
                 }
@@ -48,5 +83,10 @@ module.exports = {
     resolve: {
         extensions: [".ts", ".tsx"]
     },
-    externals: externalsResolver
+    externals: externalsResolver,
+    plugins: [
+        new WebpackOnBuildPlugin(async (stats) => {
+            await runScript("../simplr-mvdir/dist/cli.js", ["--from", "dist", "--to", "."]);
+        }),
+    ]
 };

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`export * from "./base-field";`
`2`	`2`	`export * from "./base-form";`
	`3`	`+export * from "./base-container";`