base-field state.Field type fixed.

DovydasNavickas · DovydasNavickas · commit 02687617f6c2 · 2017-04-25T22:04:40.000+03:00
OnStoreUpdated setState fixed to return the state after mutation.
simplr-forms-dom preparations for convenient publishing.
diff --git a/packages/simplr-forms-core/src/abstractions/base-field.ts b/packages/simplr-forms-core/src/abstractions/base-field.ts
diff --git a/packages/simplr-forms-dom/package.json b/packages/simplr-forms-dom/package.json
@@ -1,11 +1,11 @@
 {
   "name": "simplr-forms-dom",
-  "version": "4.0.0-pre-alpha.10",
+  "version": "4.0.0-pre-alpha.13",
   "description": "DOM components for simplr-forms.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
-  "main": "dist/simplr-forms-dom.js",
-  "types": "@types/index.d.ts",
+  "main": "main.js",
+  "types": "index.d.ts",
   "author": "simplrjs <simplr@quatrodev.com> (https://github.com/simplrjs)",
   "scripts": {
     "build": "webpack && npm run tslint",
@@ -15,15 +15,17 @@
     "release": "npm run build && npm run uglifyjs",
     "test": "jest",
     "test-watch": "jest --watchAll",
-    "test-coverage": "npm test -- --coverage"
+    "test-coverage": "npm test -- --coverage",
+    "prepublishOnly": "npm run build && node tools/postbuild.js",
+    "postpublish": "git clean -fd"
   },
   "license": "AGPL-3.0",
   "files": [
-    "dist",
-    "@types",
     "**/*.md",
     "*.js",
-    "!*.config.js"
+    "*.d.ts",
+    "!*.config.js",
+    "!tools"
   ],
   "devDependencies": {
     "@types/enzyme": "^2.7.7",
@@ -32,17 +34,21 @@
     "enzyme": "^2.8.0",
     "jest": "^19.0.2",
     "jest-enzyme": "^3.0.0",
+    "mkdirp": "^0.5.1",
+    "mv": "^2.1.1",
+    "mz": "^2.6.0",
     "sinon": "^2.1.0",
     "ts-jest": "^19.0.8",
     "ts-loader": "^2.0.3",
     "tslint": "^5.0.0",
     "typescript": "2.3.0",
-    "webpack": "^2.4.1"
+    "webpack": "^2.4.1",
+    "simplr-forms-publish": "0.0.0-dev"
   },
   "dependencies": {
     "@types/react": "^15.0.21",
     "react": "^15.5.4",
-    "simplr-forms-core": "^4.0.0-pre-alpha.10"
+    "simplr-forms-core": "^4.0.0-pre-alpha.11"
   },
   "jest": {
     "setupTestFrameworkScriptFile": "./node_modules/jest-enzyme/lib/index.js",
@@ -56,4 +62,4 @@
       "js"
     ]
   }
-}
+}
diff --git a/packages/simplr-forms-dom/src/abstractions.ts b/packages/simplr-forms-dom/src/abstractions.ts
@@ -0,0 +1 @@
+export * from "./abstractions/index";
diff --git a/packages/simplr-forms-dom/src/components/index.ts b/packages/simplr-forms-dom/src/components/index.ts
diff --git a/packages/simplr-forms-dom/src/components/text.tsx b/packages/simplr-forms-dom/src/components/text.tsx
@@ -42,7 +42,7 @@ export class Text extends BaseDomField<TextProps, BaseDomFieldState> {
         if (this.props != null && this.props.value != null) {
             return this.props.value;
         }
-        return "";
+        return this.DefaultValue;
     }
 
     protected get DefaultValue(): CoreContracts.FieldValue {
diff --git a/packages/simplr-forms-dom/src/contracts.ts b/packages/simplr-forms-dom/src/contracts.ts
@@ -0,0 +1 @@
+export * from "./contracts/field";
diff --git a/packages/simplr-forms-dom/src/contracts/index.ts b/packages/simplr-forms-dom/src/contracts/index.ts
diff --git a/packages/simplr-forms-dom/src/index.ts b/packages/simplr-forms-dom/src/index.ts
@@ -1,9 +1,2 @@
-import * as Abstractions from "./abstractions/index";
-import * as Components from "./components/index";
-import * as Contracts from "./contracts/index";
-
-export {
-    Abstractions,
-    Components,
-    Contracts
-};
+export * from "./components/form";
+export * from "./components/text";
diff --git a/packages/simplr-forms-dom/tools/postbuild.js b/packages/simplr-forms-dom/tools/postbuild.js
@@ -0,0 +1,62 @@
+const mv = require("mv");
+const fs = require("mz/fs");
+const path = require("path");
+const process = require("process");
+const mkdirp = require("mkdirp");
+
+async function move(from, to, recursively = true, removeFromDirectory = true, rootFrom = undefined) {
+    from = path.resolve(from);
+    to = path.resolve(to);
+
+    rootFrom = rootFrom || from;
+
+    const files = await fs.readdir(from);
+    for (const file of files) {
+        const stats = await fs.stat(path.join(from, file));
+        if (await stats.isFile()) {
+            const fileResolved = path.resolve(from, file);
+            const fromDirectory = path.dirname(fileResolved);
+            const toDirectory = fromDirectory.replace(rootFrom, to);
+            const toFile = path.join(toDirectory, fileResolved.replace(fromDirectory, ""));
+
+            try {
+                await mkdirpAsync(toDirectory);
+                await fs.rename(fileResolved, toFile);
+            } catch (err) {
+                console.log(err);
+            }
+        }
+        if (await stats.isDirectory()) {
+            if (recursively === true) {
+                const fromDirectory = path.join(from, file);
+                await move(fromDirectory, to, recursively, removeFromDirectory, from);
+                if (removeFromDirectory === true && await fs.exists(fromDirectory)) {
+                    await fs.rmdir(fromDirectory);
+                }
+            }
+        }
+    }
+    if (removeFromDirectory === true && await fs.exists(from)) {
+        await fs.rmdir(from);
+    }
+}
+
+async function mkdirpAsync(dir) {
+    return new Promise((resolve, reject) => {
+        mkdirp(dir, (err, made) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(made);
+        });
+    });
+}
+
+async function run() {
+    const from = "./dist";
+    const to = ".";
+    await move(from, to, true);
+}
+
+run();
diff --git a/packages/simplr-forms-dom/tsconfig.json b/packages/simplr-forms-dom/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-dom/webpack.config.js b/packages/simplr-forms-dom/webpack.config.js
@@ -1,15 +1,38 @@
 const packageJson = require("./package.json");
+const tsConfig = require("./tsconfig.json");
+const path = require("path");
 
 let externals = {};
 
 for (let key in packageJson.dependencies) {
     externals[key] = key;
 }
 
+let externalsResolver = [
+    externals,
+    function (context, request, callback) {
+        if (/.*\/abstractions\/.+$/.test(request)) {
+            const resolvedPath = path.resolve(context, request);
+            const customResolve =
+                request.indexOf("src") === -1 &&
+                resolvedPath.indexOf(path.join(__dirname, "src/abstractions")) !== -1;
+
+            if (customResolve) {
+                callback(null, "./abstractions");
+                return;
+            }
+        }
+        callback();
+    }
+];
+
 module.exports = {
-    entry: "./src/index.ts",
+    entry: {
+        abstractions: "./src/abstractions/index.ts",
+        main: "./src/index.ts"
+    },
     output: {
-        filename: "./dist/simplr-forms-dom.js",
+        filename: "./dist/[name].js",
         libraryTarget: "umd"
     },
     module: {
@@ -25,5 +48,5 @@ module.exports = {
     resolve: {
         extensions: [".ts", ".tsx"]
     },
-    externals: externals
+    externals: externalsResolver
 };
diff --git a/packages/simplr-forms-publish/package.json b/packages/simplr-forms-publish/package.json
@@ -0,0 +1,19 @@
+{
+  "private": true,
+  "name": "simplr-forms-publish",
+  "version": "0.0.0-dev",
+  "scripts": {
+    "build": "tsc -p ."
+  },
+  "dependencies": {
+    "@types/mkdirp": "^0.3.29",
+    "@types/mz": "0.0.31",
+    "@types/node": "^7.0.13",
+    "nodegit": "^0.18.1"
+  },
+  "devDependencies": {
+    "mkdirp": "^0.5.1",
+    "mz": "^2.6.0",
+    "typescript": "^2.3.0"
+  }
+}
diff --git a/packages/simplr-forms-publish/src/index.ts b/packages/simplr-forms-publish/src/index.ts
@@ -0,0 +1,67 @@
+import * as fs from "mz/fs";
+import * as path from "path";
+import * as process from "process";
+import * as mkdirp from "mkdirp";
+
+async function move(
+    from: string,
+    to: string,
+    recursively: boolean = true,
+    removeFromDirectory = true,
+    rootFrom?: string) {
+
+    from = path.resolve(from);
+    to = path.resolve(to);
+
+    rootFrom = rootFrom || from;
+
+    const files = await fs.readdir(from);
+    for (const file of files) {
+        const stats = await fs.stat(path.join(from, file));
+        if (await stats.isFile()) {
+            const fileResolved = path.resolve(from, file);
+            const fromDirectory = path.dirname(fileResolved);
+            const toDirectory = fromDirectory.replace(rootFrom, to);
+            const toFile = path.join(toDirectory, fileResolved.replace(fromDirectory, ""));
+
+            try {
+                await mkdirpAsync(toDirectory);
+                await fs.rename(fileResolved, toFile);
+            } catch (err) {
+                console.log(err);
+            }
+        }
+        if (await stats.isDirectory()) {
+            if (recursively === true) {
+                const fromDirectory = path.join(from, file);
+                await move(fromDirectory, to, recursively, removeFromDirectory, from);
+                if (removeFromDirectory === true && await fs.exists(fromDirectory)) {
+                    await fs.rmdir(fromDirectory);
+                }
+            }
+        }
+    }
+    if (removeFromDirectory === true && await fs.exists(from)) {
+        await fs.rmdir(from);
+    }
+}
+
+async function mkdirpAsync(dir: string) {
+    return new Promise((resolve, reject) => {
+        mkdirp(dir, (err, made) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve(made);
+        });
+    });
+}
+
+async function run() {
+    const from = "./dist";
+    const to = ".";
+    await move(from, to, true);
+}
+
+run();
diff --git a/packages/simplr-forms-publish/tsconfig.json b/packages/simplr-forms-publish/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es5",
+        "removeComments": false,
+        "outDir": "dist",
+        "rootDir": "src",
+        "sourceMap": false,
+        "skipDefaultLibCheck": true,
+        "declaration": true,
+        "pretty": true,
+        "strict": true,
+        "lib": [
+            "es6"
+        ]
+    },
+    "exclude": [
+        "node_modules",
+        "dist",
+        "@types",
+        "__tests__"
+    ]
+}

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class Text extends BaseDomField<TextProps, BaseDomFieldState> {`
`42`	`42`	`if (this.props != null && this.props.value != null) {`
`43`	`43`	`return this.props.value;`
`44`	`44`	`}`
`45`		`- return "";`
	`45`	`+ return this.DefaultValue;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`protected get DefaultValue(): CoreContracts.FieldValue {`