Merge pull request #741 from Meteor-Community-Packages/migrate/3.0

Meteor 3.0 compatibility

Author: jankapunkt

.github/workflows/lint-test-publish.yml

@@ -12,20 +12,20 @@ jobs:
 #    runs-on: ubuntu-latest
 #    steps:
 #      - name: checkout
-#        uses: actions/checkout@v3
+#        uses: actions/checkout@v4
 #
 #      - name: setup node
-#        uses: actions/setup-node@v3
+#        uses: actions/setup-node@v4
 #        with:
-#          node-version: 16
+#          node-version: 20
 #
 #      - name: cache dependencies
-#        uses: actions/cache@v3
+#        uses: actions/cache@v4
 #        with:
 #          path: ~/.npm
-#          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+#          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
 #          restore-keys: |
-#            ${{ runner.os }}-node-16-
+#            ${{ runner.os }}-node-20-
 #
 #      - run: cd tests && npm ci && npm run setup && npm run lint
 
@@ -36,29 +36,28 @@ jobs:
     strategy:
       matrix:
         meteorRelease:
-          - '2.3'
-          - '2.14'
+          - '3.0.2'
           # Latest version
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Setup meteor ${{ matrix.meteorRelease }}
         uses: meteorengineer/setup-meteor@v1
         with:
           meteor-release: ${{ matrix.meteorRelease }}
 
       - name: cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
-          key: ${{ runner.os }}-node-16-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ runner.os }}-node-20-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-16-
+            ${{ runner.os }}-node-20-
 
-      - run: cd tests && npm ci && npm run setup && npm run test
+      - run: cd tests && npm ci && npm run setup && npm run test

.versions

@@ -1,56 +1,24 @@
-aldeed:simple-schema@1.13.1
-allow-deny@1.1.1
-babel-compiler@7.10.5
-babel-runtime@1.5.1
-base64@1.0.12
-binary-heap@1.0.11
-boilerplate-generator@1.7.2
-callback-hook@1.5.1
-check@1.3.2
-ddp@1.4.1
-ddp-client@2.6.1
-ddp-common@1.4.0
-ddp-server@2.7.0
-diff-sequence@1.1.2
-dynamic-import@0.7.3
-ecmascript@0.16.8
-ecmascript-runtime@0.8.1
-ecmascript-runtime-client@0.12.1
-ecmascript-runtime-server@0.11.0
-ejson@1.1.3
-fetch@0.1.4
-geojson-utils@1.0.11
+aldeed:simple-schema@2.0.0
+babel-compiler@7.11.0
+babel-runtime@1.5.2
+core-runtime@1.0.0
+dynamic-import@0.7.4
+ecmascript@0.16.9
+ecmascript-runtime@0.8.2
+ecmascript-runtime-client@0.12.2
+ecmascript-runtime-server@0.11.1
+fetch@0.1.5
 http@1.4.4
-id-map@1.1.1
-inter-process-messaging@0.1.1
-lmieulet:meteor-coverage@3.2.0
-lmieulet:meteor-legacy-coverage@0.1.0
-local-test:aldeed:simple-schema@1.13.1
-logging@1.3.3
-meteor@1.11.4
+inter-process-messaging@0.1.2
+local-test:aldeed:simple-schema@2.0.0
+meteor@2.0.1
 meteortesting:browser-tests@1.4.2
 meteortesting:mocha@2.1.0
 meteortesting:mocha-core@8.0.1
-minimongo@1.9.3
-modern-browsers@0.1.10
-modules@0.20.0
-modules-runtime@0.13.1
-mongo@1.16.8
-mongo-decimal@0.1.3
-mongo-dev-server@1.1.0
-mongo-id@1.0.8
-npm-mongo@4.17.2
-ordered-dict@1.1.0
-promise@0.12.2
-random@1.2.1
-react-fast-refresh@0.2.8
-reload@1.3.1
-retry@1.1.0
-routepolicy@1.1.1
-socket-stream-client@0.5.2
-tracker@1.3.3
-typescript@4.9.5
-underscore@1.0.13
-url@1.3.2
-webapp@1.13.6
-webapp-hashing@1.1.1
+modern-browsers@0.1.11
+modules@0.20.1
+modules-runtime@0.13.2
+promise@1.0.0
+react-fast-refresh@0.2.9
+tracker@1.3.4
+url@1.3.3

lib/SimpleSchema.js

@@ -118,8 +118,9 @@ class SimpleSchema {
   }
 
   /**
-   * For Meteor apps, add a reactive dependency on the label
-   * for a key.
+   * Add a reactive dependency on the label for a key.
+   * @param key {string}
+   * @param tracker {Tracker}
    */
   reactiveLabelDependency(key, tracker = this._constructorOptions.tracker) {
     if (!key || !tracker) return;
@@ -614,10 +615,21 @@ class SimpleSchema {
     return null;
   }
 
+  /**
+   * Creates a new unnamed ValidationContext instance
+   * for this schema.
+   * @return {ValidationContext}
+   */
   newContext() {
     return new ValidationContext(this);
   }
 
+  /**
+   * Creates and stores a new named (scoped) ValidationContext for a given name
+   * and this schema and returns it.
+   * @param name {string}
+   * @return {ValidationContext}
+   */
   namedContext(name) {
     if (typeof name !== 'string') name = 'default';
     if (!this._validationContexts[name]) {

lib/ValidationContext.js

@@ -1,42 +1,61 @@
 import MongoObject from 'mongo-object';
 import doValidation from './doValidation';
 
+/**
+ * @typedef ValidationError
+ * @type object
+ * @property name {string} error name
+ * @property type {string} error type name
+ * @property value {string} actuall error message value
+ */
+
+/**
+ * State representation of a validation for
+ * a given schema.
+ *
+ *
+ */
 export default class ValidationContext {
   /**
    * @param {SimpleSchema} ss SimpleSchema instance to use for validation
    * @param {String} [name] Optional context name, accessible on context.name.
    */
   constructor(ss, name) {
     this.name = name;
+
     this._simpleSchema = ss;
     this._schema = ss.schema();
     this._schemaKeys = Object.keys(this._schema);
     this._validationErrors = [];
+    this._deps = {};
 
     // Set up validation dependencies
-    this._deps = {};
     const { tracker } = ss._constructorOptions;
-    if (tracker) {
+    this.reactive(tracker);
+  }
+  //---------------------------------------------------------------------------
+  // PUBLIC
+  //---------------------------------------------------------------------------
+
+  /**
+   * Makes this validation context
+   * reactive for Meteor-Tracker.
+   * @param tracker {Tracker}
+   */
+  reactive(tracker) {
+    if (tracker && Object.keys(this._deps).length === 0) {
       this._depsAny = new tracker.Dependency();
       this._schemaKeys.forEach((key) => {
         this._deps[key] = new tracker.Dependency();
       });
     }
   }
 
-  _markKeyChanged(key) {
-    const genericKey = MongoObject.makeKeyGeneric(key);
-    if (Object.prototype.hasOwnProperty.call(this._deps, genericKey)) this._deps[genericKey].changed();
-  }
-
-  _markKeysChanged(keys) {
-    if (!keys || !Array.isArray(keys) || !keys.length) return;
-
-    keys.forEach((key) => this._markKeyChanged(key));
-
-    this._depsAny && this._depsAny.changed();
-  }
-
+  /**
+   * Merges existing with a list of new validation errors.
+   * Reactive.
+   * @param errors ValidationError[]
+   */
   setValidationErrors(errors) {
     const previousValidationErrors = this._validationErrors.map((o) => o.name);
     const newValidationErrors = errors.map((o) => o.name);
@@ -48,6 +67,10 @@ export default class ValidationContext {
     this._markKeysChanged(changedKeys);
   }
 
+  /**
+   * Adds new validation errors to the list.
+   * @param errors ValidationError[]
+   */
   addValidationErrors(errors) {
     const newValidationErrors = errors.map((o) => o.name);
 
@@ -57,11 +80,20 @@ export default class ValidationContext {
     this._markKeysChanged(newValidationErrors);
   }
 
-  // Reset the validationErrors array
+  /**
+   * Flushes/empties the list of validation errors.
+   */
   reset() {
     this.setValidationErrors([]);
   }
 
+  /**
+   * Returns a validation error for a given key.
+   * @param key {string} the key of the field to access errors for
+   * @param genericKey {string} generic version of the key, you usually don't need
+   *  to explcitly call this. If you do, you need to wrap it using `MongoObject.makeKeyGeneric`
+   * @return {ValidationError|undefined}
+   */
   getErrorForKey(key, genericKey = MongoObject.makeKeyGeneric(key)) {
     const errors = this._validationErrors;
     const errorForKey = errors.find((error) => error.name === key);
@@ -70,17 +102,24 @@ export default class ValidationContext {
     return errors.find((error) => error.name === genericKey);
   }
 
-  _keyIsInvalid(key, genericKey) {
-    return !!this.getErrorForKey(key, genericKey);
-  }
-
-  // Like the internal one, but with deps
+  /**
+   * Returns, whether there is an error for a given key. Reactive.
+   * @param key {string}
+   * @param genericKey {string}
+   * @return {boolean}
+   */
   keyIsInvalid(key, genericKey = MongoObject.makeKeyGeneric(key)) {
     if (Object.prototype.hasOwnProperty.call(this._deps, genericKey)) this._deps[genericKey].depend();
 
     return this._keyIsInvalid(key, genericKey);
   }
 
+  /**
+   *
+   * @param key
+   * @param genericKey
+   * @return {string|*}
+   */
   keyErrorMessage(key, genericKey = MongoObject.makeKeyGeneric(key)) {
     if (Object.prototype.hasOwnProperty.call(this._deps, genericKey)) this._deps[genericKey].depend();
 
@@ -91,7 +130,16 @@ export default class ValidationContext {
   }
 
   /**
-   * Validates the object against the simple schema and sets a reactive array of error objects
+   * Validates the object against the simple schema
+   * and sets a reactive array of error objects.
+   * @param obj {object} the document (object) to validate
+   * @param extendedCustomcontext {object=}
+   * @param ignoreTypes {string[]=} list of names of ValidationError types to ignore
+   * @param keysToValidate {string[]=} list of field names (keys) to validate. Other keys are ignored then
+   * @param isModifier {boolean=} set to true if the document contains MongoDB modifiers
+   * @param mongoObject {MongoObject=} MongoObject instance to generate keyInfo
+   * @param isUpsert {boolean=} set to true if the document contains upsert modifiers
+   * @return {boolean} true if no ValidationError was found, otherwise false
    */
   validate(obj, {
     extendedCustomContext = {},
@@ -131,11 +179,19 @@ export default class ValidationContext {
     return !validationErrors.length;
   }
 
+  /**
+   * returns if this context has no errors. reactive.
+   * @return {boolean}
+   */
   isValid() {
     this._depsAny && this._depsAny.depend();
     return this._validationErrors.length === 0;
   }
 
+  /**
+   * returns the list of validation errors. reactive.
+   * @return {ValidationError[]}
+   */
   validationErrors() {
     this._depsAny && this._depsAny.depend();
     return this._validationErrors;
@@ -144,4 +200,25 @@ export default class ValidationContext {
   clean(...args) {
     return this._simpleSchema.clean(...args);
   }
+
+  //---------------------------------------------------------------------------
+  // PRIVATE
+  //---------------------------------------------------------------------------
+
+  _markKeyChanged(key) {
+    const genericKey = MongoObject.makeKeyGeneric(key);
+    if (Object.prototype.hasOwnProperty.call(this._deps, genericKey)) this._deps[genericKey].changed();
+  }
+
+  _markKeysChanged(keys) {
+    if (!keys || !Array.isArray(keys) || !keys.length) return;
+
+    keys.forEach((key) => this._markKeyChanged(key));
+
+    this._depsAny && this._depsAny.changed();
+  }
+
+  _keyIsInvalid(key, genericKey) {
+    return !!this.getErrorForKey(key, genericKey);
+  }
 }