simplr-forms-dom updated to suite new exports from simplr-forms-core.

Author: DovydasNavickas

packages/simplr-forms-core/package.json

@@ -4,8 +4,8 @@
   "description": "Shared simplr-forms logic.",
   "repository": "SimplrJS/simplr-forms",
   "homepage": "https://github.com/SimplrJS/simplr-forms",
-  "main": "dist/simplr-forms-core.js",
-  "types": "@types/index.d.ts",
+  "main": "main.js",
+  "types": "index.d.ts",
   "author": "simplrjs <[email protected]> (https://github.com/simplrjs)",
   "scripts": {
     "build": "webpack && npm run tslint",

packages/simplr-forms-core/webpack.config.js

@@ -1,16 +1,16 @@
 const packageJson = require("./package.json");
 const path = require("path");
 
-var WebpackOnBuildPlugin = require('on-build-webpack');
-var childProcess = require('child_process');
+const WebpackOnBuildPlugin = require('on-build-webpack');
+const childProcess = require('child_process');
 
 let externals = {};
 
-for (let key in packageJson.dependencies) {
+for (const key in packageJson.dependencies) {
     externals[key] = key;
 }
 
-let externalsResolver = [
+const externalsResolver = [
     externals,
     function (context, request, callback) {
         const directoriesToTest = [

packages/simplr-forms-dom/src/abstractions/base-dom-field.tsx

@@ -1,12 +1,13 @@
 import * as React from "react";
-import { Abstractions as CoreAbstractions, Contracts as CoreContracts } from "simplr-forms-core";
+import { BaseField, BaseFieldState } from "simplr-forms-core";
+import { FieldProps } from "simplr-forms-core/contracts";
 
-export interface BaseDomFieldState extends CoreAbstractions.BaseFieldState {
+export interface BaseDomFieldState extends BaseFieldState {
 
 }
 
-export abstract class BaseDomField<TProps extends CoreContracts.FieldProps, TState extends BaseDomFieldState>
-    extends CoreAbstractions.BaseField<TProps, TState> {
+export abstract class BaseDomField<TProps extends FieldProps, TState extends BaseDomFieldState>
+    extends BaseField<TProps, TState> {
     public abstract renderField(): JSX.Element | null;
 
     public render() {

packages/simplr-forms-dom/src/components/form.tsx

@@ -1,14 +1,15 @@
 import * as React from "react";
-import { Abstractions as CoreAbstractions, Contracts as CoreContracts } from "simplr-forms-core";
+import { BaseForm } from "simplr-forms-core";
+import { FormProps } from "simplr-forms-core/contracts";
 import { OnChangeCallback } from "../contracts/field";
 import { FormOnSubmitCallback } from "../contracts/form";
 
-export interface FormProps extends CoreContracts.FormProps, React.HTMLProps<HTMLFormElement> {
+export interface FormProps extends FormProps, React.HTMLProps<HTMLFormElement> {
     onSubmit?: FormOnSubmitCallback;
     onChange?: OnChangeCallback<any>;
 }
 
-export class Form extends CoreAbstractions.BaseForm<FormProps, {}> {
+export class Form extends BaseForm<FormProps, {}> {
     render() {
         return <form>
             {this.props.children}

packages/simplr-forms-dom/src/contracts/field.ts

@@ -1,5 +1,6 @@
-import { Contracts as CoreContracts } from "simplr-forms-core";
+import * as React from "react";
+import { FieldValue } from "simplr-forms-core/contracts";
 
 export interface OnChangeCallback<TElement> extends React.EventHandler<React.FormEvent<TElement>> {
-    (event: React.FormEvent<TElement> | undefined, newValue: CoreContracts.FieldValue, fieldId: string, formId: string): void;
+    (event: React.FormEvent<TElement> | undefined, newValue: FieldValue, fieldId: string, formId: string): void;
 }

packages/simplr-forms-dom/src/contracts/form.ts

@@ -0,0 +1,7 @@
+import * as React from "react";
+import { FieldValue, FormError } from "simplr-forms-core/contracts";
+import { FormStore } from "simplr-forms-core/stores";
+
+export interface FormOnSubmitCallback extends React.FormEventHandler<HTMLFormElement> {
+    (event: React.FormEvent<HTMLFormElement>, store: FormStore): void | Promise<any> | FormError | string;
+}

packages/simplr-forms-dom/webpack.config.js

@@ -2,16 +2,16 @@ 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');
+const WebpackOnBuildPlugin = require('on-build-webpack');
+const childProcess = require('child_process');
 
 let externals = {};
 
-for (let key in packageJson.dependencies) {
+for (const key in packageJson.dependencies) {
     externals[key] = key;
 }
 
-let externalsResolver = [
+const externalsResolver = [
     externals,
     function (context, request, callback) {
         if (/.*\/abstractions\/.+$/.test(request)) {