Skip to content

Commit

Permalink
Code refactoring and fix codacity issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Bijaoui committed Jul 3, 2018
1 parent c87e932 commit 320a4b5
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 42 deletions.
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -133,7 +133,8 @@
"trailingComma": "none",
"bracketSpacing": true,
"semi": true,
"useTabs": true
"useTabs": true,
"arrowParens": "always"
},
"nyc": {
"include": [
Expand Down
23 changes: 3 additions & 20 deletions src/formGroup.vue
Expand Up @@ -23,27 +23,10 @@
</div>
</template>
<script>
import { get as objGet, forEach, isNil, isFunction } from "lodash";
import { get as objGet, isNil, isFunction } from "lodash";
import { slugifyFormID } from "./utils/schema";
import formMixin from "./formMixin.js";
let fieldComponents = {};
let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
forEach(coreFields.keys(), key => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = coreFields(key).default;
});
if (process.env.FULL_BUNDLE) {
let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
forEach(Fields.keys(), key => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = Fields(key).default;
});
}
import fieldComponents from "./utils/fieldsLoader.js";
export default {
name: "form-group",
Expand Down Expand Up @@ -111,7 +94,7 @@ export default {
return field.hint;
},
fieldErrors(field) {
return this.errors.filter(e => e.field === field).map(item => item.error);
return this.errors.filter((e) => e.field === field).map((item) => item.error);
},
modelUpdated(newVal, schema) {
this.$emit("model-updated", newVal, schema);
Expand Down
23 changes: 2 additions & 21 deletions src/index.js
@@ -1,31 +1,12 @@
const component = require("./formGenerator.vue").default;
const schema = require("./utils/schema.js");
const validators = require("./utils/validators.js").default;
const fieldComponents = require("./utils/fieldsLoader").default;
const abstractField = require("./fields/abstractField").default;
const install = Vue => {
const install = (Vue) => {
Vue.component("VueFormGenerator", module.exports.component);
};

const forEach = require("lodash").forEach;

let fieldComponents = {};

let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);

forEach(coreFields.keys(), key => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = coreFields(key).default;
});

if (process.env.FULL_BUNDLE) {
let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);

forEach(Fields.keys(), key => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = Fields(key).default;
});
}

module.exports = {
component,
schema,
Expand Down
21 changes: 21 additions & 0 deletions src/utils/fieldsLoader.js
@@ -0,0 +1,21 @@
const forEach = require("lodash").forEach;

let fieldComponents = {};

let coreFields = require.context("../fields/core", false, /^\.\/field([\w-_]+)\.vue$/);

forEach(coreFields.keys(), (key) => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = coreFields(key).default;
});

if (process.env.FULL_BUNDLE) {
let optionalFields = require.context("../fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);

forEach(optionalFields.keys(), (key) => {
let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
fieldComponents[compName] = optionalFields(key).default;
});
}

module.exports = fieldComponents;

0 comments on commit 320a4b5

Please sign in to comment.