Skip to content

Commit e6c8ca7

Browse files
AnthropicAnthropic
committed
Merge remote-tracking branch 'refs/remotes/origin/development'
2 parents 63c8783 + a473c1f commit e6c8ca7

36 files changed

+3399
-35
lines changed

Diff for: ‎.babelrc

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"presets": [
3+
[ "es2015" ]
4+
],
5+
"plugins": [ "transform-flow-strip-types" ]
6+
}

Diff for: ‎.github/ISSUE_TEMPLATE.md

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
Only include sections relevant to your issue.
3+
4+
If you have not read docs/support.md and followed its guidance you may be ignored or closed without response.
5+
6+
Please use PREVIEW before you submit!!
7+
-->
8+
#### Enhancement
9+
As a user/developer, when I ... I should be able to ...
10+
11+
#### Expected behaviour
12+
I expected ...
13+
14+
#### Actual behaviour
15+
It actually ...
16+
17+
#### Gist/Plunker/Demo
18+
[Description](url)
19+
20+
#### Related issues
21+
This is/maybe related to ...
22+
23+
@json-schema-form/angular-schema-form-lead

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#### Description
2+
3+
Add your description here
4+
5+
#### Fixes Related issues
6+
- add related
7+
- issues here
8+
9+
#### Checklist
10+
- [ ] I have read and understand the CONTRIBUTIONS.md file
11+
- [ ] I have searched for and linked related issues
12+
- [ ] I have created test cases to ensure quick resolution of the PR is easier
13+
- [ ] I am NOT targeting main branch
14+
- [ ] I did NOT include the dist folder in my PR
15+
16+
@json-schema-form/angular-schema-form-lead

Diff for: ‎.gitignore

+35-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
# Logs
2-
logs
3-
*.log
4-
npm-debug.log*
5-
6-
# Runtime data
7-
pids
8-
*.pid
9-
*.seed
10-
11-
# Directory for instrumented libs generated by jscoverage/JSCover
12-
lib-cov
13-
14-
# Coverage directory used by tools like istanbul
15-
coverage
16-
17-
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
18-
.grunt
19-
20-
# node-waf configuration
21-
.lock-wscript
22-
23-
# Compiled binary addons (http://nodejs.org/api/addons.html)
24-
build/Release
25-
26-
# Dependency directory
27-
node_modules
28-
29-
# Optional npm cache directory
30-
.npm
31-
32-
# Optional REPL history
33-
.node_repl_history
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
# /dist
5+
/tmp
6+
7+
# dependencies
8+
/node_modules
9+
/bower_components
10+
11+
# IDEs and editors
12+
/.idea
13+
/.vscode
14+
.editorconfig
15+
.project
16+
.classpath
17+
*.launch
18+
.settings/
19+
20+
# misc
21+
/.sass-cache
22+
/connect.lock
23+
/coverage/*
24+
/libpeerconnection.log
25+
npm-debug.log
26+
testem.log
27+
/typings
28+
29+
# e2e
30+
/e2e/*.js
31+
/e2e/*.map
32+
33+
#System Files
34+
.DS_Store
35+
Thumbs.db

Diff for: ‎.jscsrc

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"preset": "google",
3+
"disallowSpacesInsideObjectBrackets": null,
4+
"requireSpacesInsideObjectBrackets": {
5+
"allExcept": [ "[", "]", "{", "}" ]
6+
},
7+
"disallowSpacesInsideArrayBrackets": null,
8+
"requireSpacesInsideArrayBrackets": {
9+
"allExcept": [ "[", "]", "{", "}" ]
10+
},
11+
"disallowKeywordsOnNewLine": [ ],
12+
"disallowMultipleVarDecl": null,
13+
"requireSemicolons": true
14+
}

Diff for: ‎.mocha

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
--compilers js:babel-register
2+
--require babel-polyfill
3+
--reporter spec
4+
--watch-extensions js
5+
src/**/*.spec.js

Diff for: ‎.mocha.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"reporterEnabled": "spec, markdown",
3+
"markdownReporterOptions": {
4+
"output": "test.md",
5+
"mochaFile": "test.md"
6+
}
7+
}

Diff for: ‎.mocha.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
--compilers js:babel-register
2+
--require babel-polyfill
3+
--recursive
4+
--reporter markdown
5+
--watch-extensions js
6+
src/**/*.spec.js

Diff for: ‎.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
language: node_js
2+
node_js:
3+
- node
4+
5+
sudo: false

Diff for: ‎README.md

+60-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,60 @@
1-
# json-schema-form
2-
Core library
1+
# JSON Schema Form Core
2+
[![Gitter](https://img.shields.io/badge/GITTER-JOIN%20CHAT%20%E2%86%92-ff69b4.svg?style=flat-square)](https://gitter.im/json-schema-form/angular-schema-form?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
3+
[![Build Status](https://travis-ci.org/json-schema-form/json-schema-form-core.svg?branch=development)](https://travis-ci.org/json-schema-form/json-schema-form-core)
4+
5+
Core library for working with JSON-Schema with a UI-Schema (Form) definition that doesn't depend on a framework.
6+
7+
This library, through the use of its merge module, combines the schema and ui-schema
8+
into a canonical schema for use by its services and external libraries.
9+
10+
You **DO NOT** use this file in addition to Angular Schema Form, it is embedded at
11+
build into any frameworks using it.
12+
13+
## Work-In-Progress!
14+
There is [test output](docs/test.md) that forms some super basic documentation
15+
and I intend to expand them much further to the point of almost being
16+
useful before I create a proper API and document that.
17+
18+
## Keeping Track
19+
After changing to Webpack 2, this library now includes a detailed version
20+
header which is passed through into `Angular Schema Form` and also the `Bootstrap` decorator bundle
21+
22+
```javascript
23+
/*!
24+
* json-schema-form-core
25+
* @version 1.0.0-alpha.5
26+
* @date Sat, 14 Jan 2017 08:08:15 GMT
27+
* @link https://github.com/json-schema-form/json-schema-form-core
28+
* @license MIT
29+
* Copyright (c) 2014-2017 JSON Schema Form
30+
*/
31+
```
32+
33+
## Contributing / Plans
34+
The main contributions we need to the core at the moment are related to both the migration
35+
of `Angular Schema Form` features to the core (like templates/builders) and the addition
36+
of an API for use by ASF (Angular) and RSF (React) libraries.
37+
38+
Please contact @Anthropic via our [Gitter](https://gitter.im/json-schema-form/angular-schema-form) if you wish to get involved.
39+
40+
## Testing it
41+
42+
### With Angular Schema Form
43+
There is a branch in angular-schema-form called `feature/webpack-babel` that integrates the core.
44+
To use it roughly follow these steps:
45+
46+
* Clone angular-schema-form to a **sibling** directory and switch to branch `feature/webpack-babel`
47+
* `npm install` to install dependencies
48+
* `npm run build` to build with the core.
49+
* Use dist/angular-schema-form.js, now with the core from this folder. *No need to also load ObjectPath since it is already included*
50+
51+
### With Mocha tests
52+
Tests are written in mocha + chai and run trough `npm test`.
53+
54+
When the command `npm run testdoc` is run instead, the tests will also generate a readable
55+
`markdown` file [test.md](docs/test.md) to document elements of the library.
56+
57+
## Notes
58+
* ObjectPath is bundled with json-schema-form-core
59+
* angular-schema-form bundles json-schema-form-core so the user doesn't have to include it as an dependency.
60+
* The code for not using ObjectPath on Angular 1.2 is removed. Could maybe be fixed but I (davidlgj) strongly believe its time to drop Angular 1.2 support since it complicates validation code as well.

0 commit comments

Comments
 (0)