From 4b7ff2146f1ca3907b46cb6ba943d5ed1624a4ed Mon Sep 17 00:00:00 2001 From: Stefan Zermatten Date: Tue, 30 Jul 2019 15:21:30 +0200 Subject: [PATCH] Purged all references to the schema factory, use SCHEMA_OPTIONS constant instead --- app/imports/api/campaign/Encounter.js | 3 +-- app/imports/api/campaign/Parties.js | 3 +-- app/imports/api/creature/CreatureProperties.js | 3 +-- app/imports/api/creature/Creatures.js | 3 +-- app/imports/api/icons/Icons.js | 3 +-- app/imports/api/library/Libraries.js | 4 ++-- app/imports/api/library/LibraryNodes.js | 3 +-- app/imports/api/meta/Blacklist.js | 4 +++- app/imports/api/meta/ChangeLogs.js | 4 +++- app/imports/api/meta/Reports.js | 4 +++- app/imports/api/parenting/ChildSchema.js | 3 +-- app/imports/api/properties/Actions.js | 1 - app/imports/api/properties/Attributes.js | 2 +- app/imports/api/properties/ClassLevels.js | 1 - app/imports/api/properties/Containers.js | 3 --- app/imports/api/properties/Effects.js | 3 --- app/imports/api/properties/Skills.js | 14 +------------- app/imports/api/properties/Spells.js | 13 +------------ app/imports/api/users/Users.js | 5 ++--- app/imports/server/config/simpleSchemaDebug.js | 1 - 20 files changed, 23 insertions(+), 57 deletions(-) diff --git a/app/imports/api/campaign/Encounter.js b/app/imports/api/campaign/Encounter.js index 590ec76d..0b8aed79 100644 --- a/app/imports/api/campaign/Encounter.js +++ b/app/imports/api/campaign/Encounter.js @@ -1,9 +1,8 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; let Encounters = new Mongo.Collection("encounters"); -let EncounterSchema = schema({ +let EncounterSchema = new SimpleSchema({ //an encounter is a single flow of time all parties in an encounter are in-sync time wise }); diff --git a/app/imports/api/campaign/Parties.js b/app/imports/api/campaign/Parties.js index 23db61af..41ce048c 100644 --- a/app/imports/api/campaign/Parties.js +++ b/app/imports/api/campaign/Parties.js @@ -1,9 +1,8 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; let Parties = new Mongo.Collection("parties"); -let partySchema = schema({ +let partySchema = new SimpleSchema({ name: { type: String, defaultValue: "New Party", diff --git a/app/imports/api/creature/CreatureProperties.js b/app/imports/api/creature/CreatureProperties.js index b9324895..2952a413 100644 --- a/app/imports/api/creature/CreatureProperties.js +++ b/app/imports/api/creature/CreatureProperties.js @@ -1,5 +1,4 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; import ChildSchema from '/imports/api/parenting/ChildSchema.js'; import propertySchemas from '/imports/api/properties/propertySchemas.js'; import Libraries from '/imports/api/library/Libraries.js'; @@ -8,7 +7,7 @@ import getModifierFields from '/imports/api/getModifierFields.js'; let CreatureProperties = new Mongo.Collection('creatureProperties'); -let CreaturePropertySchema = schema({ +let CreaturePropertySchema = new SimpleSchema({ creaturePropertyType: { type: String, allowedValues: Object.keys(propertySchemas), diff --git a/app/imports/api/creature/Creatures.js b/app/imports/api/creature/Creatures.js index aad6df87..8621c678 100644 --- a/app/imports/api/creature/Creatures.js +++ b/app/imports/api/creature/Creatures.js @@ -1,5 +1,4 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; import deathSaveSchema from "/imports/api/creature/subSchemas/DeathSavesSchema.js" import ColorSchema from "/imports/api/creature/subSchemas/ColorSchema.js"; import SharingSchema from '/imports/api/sharing/SharingSchema.js'; @@ -29,7 +28,7 @@ let CreatureSettingsSchema = new SimpleSchema({ }, }); -let CreatureSchema = schema({ +let CreatureSchema = new SimpleSchema({ // Strings name: { type: String, diff --git a/app/imports/api/icons/Icons.js b/app/imports/api/icons/Icons.js index 9229c27f..6ce17817 100644 --- a/app/imports/api/icons/Icons.js +++ b/app/imports/api/icons/Icons.js @@ -1,9 +1,8 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; let Icons = new Mongo.Collection('icons'); -iconsSchema = schema({ +iconsSchema = new SimpleSchema({ name: { type: String, unique: true, diff --git a/app/imports/api/library/Libraries.js b/app/imports/api/library/Libraries.js index f83c48ae..b7c75200 100644 --- a/app/imports/api/library/Libraries.js +++ b/app/imports/api/library/Libraries.js @@ -1,4 +1,4 @@ -import schema from '/imports/api/schema.js'; +import SimpleSchema from 'simpl-schema'; import SharingSchema from '/imports/api/sharing/SharingSchema.js'; import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js'; @@ -13,7 +13,7 @@ import simpleSchemaMixin from '/imports/api/creature/mixins/simpleSchemaMixin.js */ let Libraries = new Mongo.Collection('libraries'); -let LibrarySchema = schema({ +let LibrarySchema = new SimpleSchema({ name: { type: String, }, diff --git a/app/imports/api/library/LibraryNodes.js b/app/imports/api/library/LibraryNodes.js index f87535ab..2a7eb426 100644 --- a/app/imports/api/library/LibraryNodes.js +++ b/app/imports/api/library/LibraryNodes.js @@ -1,5 +1,4 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; import ChildSchema from '/imports/api/parenting/ChildSchema.js'; import librarySchemas from '/imports/api/library/librarySchemas.js'; import Libraries from '/imports/api/library/Libraries.js'; @@ -8,7 +7,7 @@ import getModifierFields from '/imports/api/getModifierFields.js'; let LibraryNodes = new Mongo.Collection('libraryNodes'); -let LibraryNodeSchema = schema({ +let LibraryNodeSchema = new SimpleSchema({ libraryNodeType: { type: String, allowedValues: Object.keys(librarySchemas), diff --git a/app/imports/api/meta/Blacklist.js b/app/imports/api/meta/Blacklist.js index bd34caad..057a925c 100644 --- a/app/imports/api/meta/Blacklist.js +++ b/app/imports/api/meta/Blacklist.js @@ -1,6 +1,8 @@ +import SimpleSchema from 'simpl-schema'; + Blacklist = new Mongo.Collection("blacklist"); -Schemas.Blacklist = schema({ +Schemas.Blacklist = new SimpleSchema({ userId: { type: String, }, diff --git a/app/imports/api/meta/ChangeLogs.js b/app/imports/api/meta/ChangeLogs.js index 835b887f..87781578 100644 --- a/app/imports/api/meta/ChangeLogs.js +++ b/app/imports/api/meta/ChangeLogs.js @@ -1,6 +1,8 @@ +import SimpleSchema from 'simpl-schema'; + ChangeLogs = new Mongo.Collection("changeLogs"); -Schemas.ChangeLog = schema({ +Schemas.ChangeLog = new SimpleSchema({ version: { type: String, }, diff --git a/app/imports/api/meta/Reports.js b/app/imports/api/meta/Reports.js index a52d7e74..533888a8 100644 --- a/app/imports/api/meta/Reports.js +++ b/app/imports/api/meta/Reports.js @@ -1,6 +1,8 @@ +import SimpleSchema from 'simpl-schema'; + Reports = new Mongo.Collection("reports"); -Schemas.Report = schema({ +Schemas.Report = new SimpleSchema({ owner: { type: String, regEx: SimpleSchema.RegEx.Id, diff --git a/app/imports/api/parenting/ChildSchema.js b/app/imports/api/parenting/ChildSchema.js index 15e525f0..9d922c7e 100644 --- a/app/imports/api/parenting/ChildSchema.js +++ b/app/imports/api/parenting/ChildSchema.js @@ -1,5 +1,4 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; const RefSchema = new SimpleSchema({ id: { @@ -12,7 +11,7 @@ const RefSchema = new SimpleSchema({ }, }); -let ChildSchema = schema({ +let ChildSchema = new SimpleSchema({ order: { type: Number, min: 0, diff --git a/app/imports/api/properties/Actions.js b/app/imports/api/properties/Actions.js index 700faf34..b4589131 100644 --- a/app/imports/api/properties/Actions.js +++ b/app/imports/api/properties/Actions.js @@ -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'; diff --git a/app/imports/api/properties/Attributes.js b/app/imports/api/properties/Attributes.js index cd376111..d7c52560 100644 --- a/app/imports/api/properties/Attributes.js +++ b/app/imports/api/properties/Attributes.js @@ -62,7 +62,7 @@ let AttributeSchema = new SimpleSchema({ }, }); -let ComputedAttributeSchema = schema({ +let ComputedAttributeSchema = new SimpleSchema({ // The computed value of the attribute value: { type: Number, diff --git a/app/imports/api/properties/ClassLevels.js b/app/imports/api/properties/ClassLevels.js index a67d7bb0..5af2190d 100644 --- a/app/imports/api/properties/ClassLevels.js +++ b/app/imports/api/properties/ClassLevels.js @@ -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({ diff --git a/app/imports/api/properties/Containers.js b/app/imports/api/properties/Containers.js index bb69f45f..d02cc841 100644 --- a/app/imports/api/properties/Containers.js +++ b/app/imports/api/properties/Containers.js @@ -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: { diff --git a/app/imports/api/properties/Effects.js b/app/imports/api/properties/Effects.js index ef2cbe7f..41620c7e 100644 --- a/app/imports/api/properties/Effects.js +++ b/app/imports/api/properties/Effects.js @@ -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 diff --git a/app/imports/api/properties/Skills.js b/app/imports/api/properties/Skills.js index a7d0a66c..76ff3e95 100644 --- a/app/imports/api/properties/Skills.js +++ b/app/imports/api/properties/Skills.js @@ -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, diff --git a/app/imports/api/properties/Spells.js b/app/imports/api/properties/Spells.js index 3b75994a..90df03bf 100644 --- a/app/imports/api/properties/Spells.js +++ b/app/imports/api/properties/Spells.js @@ -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, diff --git a/app/imports/api/users/Users.js b/app/imports/api/users/Users.js index fe7a9069..03a24902 100644 --- a/app/imports/api/users/Users.js +++ b/app/imports/api/users/Users.js @@ -1,7 +1,6 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; -const userSchema = schema({ +const userSchema = new SimpleSchema({ username: { type: String, optional: true, @@ -95,7 +94,7 @@ Meteor.users.setDarkMode = new ValidatedMethod({ Meteor.users.sendVerificationEmail = new ValidatedMethod({ name: 'Users.methods.sendVerificationEmail', - validate: schema({ + validate: new SimpleSchema({ userId:{ type: String, optional: true, diff --git a/app/imports/server/config/simpleSchemaDebug.js b/app/imports/server/config/simpleSchemaDebug.js index 08f51eb8..1bf2e900 100644 --- a/app/imports/server/config/simpleSchemaDebug.js +++ b/app/imports/server/config/simpleSchemaDebug.js @@ -1,5 +1,4 @@ import SimpleSchema from 'simpl-schema'; -import schema from '/imports/api/schema.js'; if (Meteor.isDevelopment){ SimpleSchema.debug = true