Purged all references to the schema factory, use SCHEMA_OPTIONS constant instead

This commit is contained in:
Stefan Zermatten
2019-07-30 15:21:30 +02:00
parent 2385b69720
commit 4b7ff2146f
20 changed files with 23 additions and 57 deletions

View File

@@ -1,5 +1,4 @@
import SimpleSchema from 'simpl-schema';
import schema from '/imports/api/schema.js';
import AdjustmentSchema from '/imports/api/creature/subSchemas/AdjustmentSchema.js';
import StoredBuffSchema from '/imports/api/properties/Buffs.js';

View File

@@ -62,7 +62,7 @@ let AttributeSchema = new SimpleSchema({
},
});
let ComputedAttributeSchema = schema({
let ComputedAttributeSchema = new SimpleSchema({
// The computed value of the attribute
value: {
type: Number,

View File

@@ -1,5 +1,4 @@
import SimpleSchema from 'simpl-schema';
import { PropertySchema } from '/imports/api/properties/Properties.js'
import VARIABLE_NAME_REGEX from '/imports/constants/VARIABLE_NAME_REGEX.js';
let ClassLevelSchema = new SimpleSchema({

View File

@@ -1,7 +1,4 @@
import SimpleSchema from 'simpl-schema';
import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js";
import { PropertySchema } from '/imports/api/properties/Properties.js'
import ChildSchema from '/imports/api/parenting/ChildSchema.js';
let ContainerSchema = new SimpleSchema({
name: {

View File

@@ -1,7 +1,4 @@
import SimpleSchema from 'simpl-schema';
import { PropertySchema } from '/imports/api/properties/Properties.js'
let Effects = new Mongo.Collection('effects');
/*
* Effects are reason-value attached to skills and abilities

View File

@@ -1,22 +1,10 @@
import SimpleSchema from 'simpl-schema';
import schema from '/imports/api/schema.js';
import { PropertySchema } from '/imports/api/properties/Properties.js'
import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
// Mixins
import recomputeCreatureMixin from '/imports/api/creature/mixins/recomputeCreatureMixin.js';
import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js';
import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js';
import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js';
import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js';
/*
* Skills are anything that results in a modifier to be added to a D20
* Skills have an ability score modifier that they use as their basis
*/
let SkillSchema = schema({
let SkillSchema = new SimpleSchema({
name: {
type: String,
optional: true,

View File

@@ -1,15 +1,4 @@
import ColorSchema from '/imports/api/creature/subSchemas/ColorSchema.js';
import SimpleSchema from 'simpl-schema';
import schema from '/imports/api/schema.js';
import { PropertySchema } from '/imports/api/properties/Properties.js'
// Mixins
import creaturePermissionMixin from '/imports/api/creature/mixins/creaturePermissionMixin.js';
import { setDocToLastMixin } from '/imports/api/creature/mixins/setDocToLastMixin.js';
import { setDocAncestryMixin, ensureAncestryContainsCharIdMixin } from '/imports/api/parenting/parenting.js';
import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js';
import propagateInheritanceUpdateMixin from '/imports/api/creature/mixins/propagateInheritanceUpdateMixin.js';
import updateSchemaMixin from '/imports/api/creature/mixins/updateSchemaMixin.js';
const magicSchools = [
'abjuration',
@@ -22,7 +11,7 @@ const magicSchools = [
'transmutation',
];
let SpellSchema = schema({
let SpellSchema = new SimpleSchema({
name: {
type: String,
optional: true,