not-node 5.0.19 → 5.1.0

package/src/model/versioning.js

@@ -1,141 +1,165 @@
 /** @module Model/Versioning */
 
-const diff = require('deep-diff').diff;
+const diff = require("deep-diff").diff;
+
+const TECH_FIELDS = [
+    "_id",
+    "__version",
+    "__versions",
+    "__v",
+    "__latest",
+    "__closed",
+];
+
+const ERR_NO_PREVIOUS_VERSIONS = "No previous version!";
+const ERR_SAME_OLD_DATA = "Same old data";
+
+class ModelVersioning {
+    static versionsHistoryExists(data) {
+        return Array.isArray(data.__versions) && data.__versions.length > 0;
+    }
 
-const TECH_FIELDS = ['_id', '__version', '__versions', '__v', '__latest', '__closed'];
+    static extractVersionNumber(data) {
+        return typeof data.__version !== "undefined" && data.__version !== null
+            ? data.__version
+            : 0;
+    }
 
-const ERR_NO_PREVIOUS_VERSIONS = 'No previous version!';
-const ERR_SAME_OLD_DATA = 'Same old data';
+    static getLatestVersionId(data) {
+        return data.__versions[0];
+    }
 
-class ModelVersioning{
+    static addVersionToHistory(doc, version) {
+        if (!ModelVersioning.versionsHistoryExists(doc)) {
+            doc.__versions = [];
+        }
+        doc.__versions.unshift(version._id); //первая в массиве последняя [3,2,1,0]
+        return doc.save();
+    }
 
-  static versionsHistoryExists(data){
-    return Array.isArray(data.__versions) && (data.__versions.length > 0);
-  }
+    static stripTechData(a) {
+        TECH_FIELDS.forEach((f) => {
+            delete a[f];
+        });
+        return a;
+    }
 
-  static extractVersionNumber(data){
-    return (typeof data.__version !== 'undefined' && data.__version !== null) ? data.__version : 0;
-  }
+    static jsonCopy(a) {
+        return JSON.parse(JSON.stringify(a));
+    }
 
-  static getLatestVersionId(data){
-    return data.__versions[0];
-  }
+    static isThisDocsDifferent(a, b) {
+        a = ModelVersioning.stripTechData(a);
+        b = ModelVersioning.stripTechData(b);
+        const plainA = ModelVersioning.jsonCopy(a);
+        const plainB = ModelVersioning.jsonCopy(b);
+        const diffLog = diff(plainA, plainB);
+        return typeof diffLog !== "undefined";
+    }
 
-  static addVersionToHistory(doc, version){
-    if (!ModelVersioning.versionsHistoryExists(doc)) {
-      doc.__versions = [];
+    /**
+     * Compares latest version in __versions list in data with data
+     * @param {MongooseModel}  thisModel   model of data
+     * @param {Object}         data        data to save
+     * @return {boolean}                   if data differs from latest version
+     */
+    static async isNew(thisModel, data) {
+        let latestId = ModelVersioning.getLatestVersionId(data);
+        let previous = await thisModel.findById(latestId);
+        if (typeof previous !== "undefined" && previous !== null) {
+            return ModelVersioning.isThisDocsDifferent(
+                data,
+                previous.toObject()
+            );
+        } else {
+            throw new Error(ERR_NO_PREVIOUS_VERSIONS);
+        }
     }
-    doc.__versions.unshift(version._id); //первая в массиве последняя [3,2,1,0]
-    return doc.save();
-  }
-
-  static stripTechData(a) {
-    TECH_FIELDS.forEach((f)=>{
-      delete a[f];
-    });
-    return a;
-  }
-
-  static isThisDocsDifferent(a, b) {
-    a = ModelVersioning.stripTechData(a);
-    b = ModelVersioning.stripTechData(b);
-    let diffLog = diff(a, b);
-    return (typeof diffLog !== 'undefined');
-  }
-
-  /**
-  * Compares latest version in __versions list in data with data
-  * @param {MongooseModel}  thisModel   model of data
-  * @param {Object}         data        data to save
-  * @return {boolean}                   if data differs from latest version
-  */
-  static async isNew(thisModel, data) {
-    let latestId = ModelVersioning.getLatestVersionId(data);
-    let previous = await thisModel.findById(latestId);
-    if (typeof previous !== 'undefined' && previous !== null) {
-      return ModelVersioning.isThisDocsDifferent(data, previous.toObject());
-    } else {
-      throw new Error(ERR_NO_PREVIOUS_VERSIONS);
+
+    /**
+     * Saves current version to versions archive, updates current version versioning tags
+     * @param {ObjectId}      id             current version _id (just saved version)
+     * @param {Object}      data             data to save
+     * @param {MongooseModel} thisModel      model to use
+     * @return {Promise<MongooseDocument>}   current version with updated versioning tags
+     */
+    static async saveVersion(id, data, model) {
+        let preservedVersionNumber = ModelVersioning.extractVersionNumber(data),
+            preservedVersionsList = [...data.__versions]; //making copy
+        let different = await ModelVersioning.isNew(model, data);
+        if (different) {
+            //it's not latest version, it's archived copy
+            delete data.__latest;
+            //saves to archive with preserved data
+            let versionDoc = new model(data);
+            versionDoc.__version = preservedVersionNumber;
+            versionDoc.__versions = preservedVersionsList;
+            await versionDoc.save();
+            //updating history
+            let originalDoc = await model.findById(id).exec();
+            originalDoc.__version = preservedVersionNumber + 1;
+            return await ModelVersioning.addVersionToHistory(
+                originalDoc,
+                versionDoc
+            );
+        }
+        throw new Error(ERR_SAME_OLD_DATA);
     }
-  }
-
-  /**
-  * Saves current version to versions archive, updates current version versioning tags
-  * @param {ObjectId}      id             current version _id (just saved version)
-  * @param {Object}      data             data to save
-  * @param {MongooseModel} thisModel      model to use
-  * @return {Promise<MongooseDocument>}   current version with updated versioning tags
-  */
-  static async saveVersion(id, data, model){
-    let preservedVersionNumber = ModelVersioning.extractVersionNumber(data),
-      preservedVersionsList = [...data.__versions];//making copy
-    let different = await ModelVersioning.isNew(model, data);
-    if (different) {
-      //it's not latest version, it's archived copy
-      delete data.__latest;
-      //saves to archive with preserved data
-      let versionDoc = new model(data);
-      versionDoc.__version = preservedVersionNumber;
-      versionDoc.__versions = preservedVersionsList;
-      await versionDoc.save();
-      //updating history
-      let originalDoc = await model.findById(id).exec();
-      originalDoc.__version = preservedVersionNumber + 1;
-      return await ModelVersioning.addVersionToHistory(originalDoc, versionDoc);
+
+    /**
+     * Saves first version. Run AFTER doing .save() on document.
+     * @param {ObjectId}      id             current version _id (just saved version)
+     * @param {Object}      data             data to save
+     * @param {MongooseModel} thisModel      model to use
+     * @return {Promise<MongooseDocument>}   current version with updated versions tags
+     */
+    static async saveFirstVersion(id, data, thisModel) {
+        //it's not latest version, it's archived copy
+        delete data.__latest;
+        //saves to archive
+        let versionDoc = new thisModel(data);
+        await versionDoc.save();
+        //retrieving original
+        let originalDoc = await thisModel.findById(id).exec();
+        //first version
+        originalDoc.__version = 1;
+        //adding to history
+        return await ModelVersioning.addVersionToHistory(
+            originalDoc,
+            versionDoc
+        );
     }
-    throw new Error(ERR_SAME_OLD_DATA);
-  }
-
-  /**
-  * Saves first version. Run AFTER doing .save() on document.
-  * @param {ObjectId}      id             current version _id (just saved version)
-  * @param {Object}      data             data to save
-  * @param {MongooseModel} thisModel      model to use
-  * @return {Promise<MongooseDocument>}   current version with updated versions tags
-  */
-  static async saveFirstVersion(id, data, thisModel){
-    //it's not latest version, it's archived copy
-    delete data.__latest;
-    //saves to archive
-    let versionDoc = new thisModel(data);
-    await versionDoc.save();
-    //retrieving original
-    let originalDoc = await thisModel.findById(id).exec();
-    //first version
-    originalDoc.__version = 1;
-    //adding to history
-    return await ModelVersioning.addVersionToHistory(originalDoc, versionDoc);
-  }
-
-  /**
-  * Save document
-  * if document is new - creates document
-  * if it's updated document - updates document and versioning history
-  * @param {MongooseModel} doc document to save
-  * @return {Promise<MongooseDocument>}   current version with updated versions tags
-  */
-  static saveDiff(doc){
-    let data = doc.toObject(),
-      id = data._id;
-    delete data._id;
-    if (ModelVersioning.versionsHistoryExists(data)) {
-      return ModelVersioning.saveVersion(id, data, this);
-    } else {
-      return ModelVersioning.saveFirstVersion(id, data, this);
+
+    /**
+     * Save document
+     * if document is new - creates document
+     * if it's updated document - updates document and versioning history
+     * @param {MongooseModel} doc document to save
+     * @return {Promise<MongooseDocument>}   current version with updated versions tags
+     */
+    static saveDiff(doc) {
+        let data = doc.toObject(),
+            id = data._id;
+        delete data._id;
+        if (ModelVersioning.versionsHistoryExists(data)) {
+            return ModelVersioning.saveVersion(id, data, this);
+        } else {
+            return ModelVersioning.saveFirstVersion(id, data, this);
+        }
     }
-  }
-
-  /**
-  * Idea is that you first save or update your doc
-  * then you run Doc.version(_id_of_just_saved_doc)
-  * and it will create archived copy of current document,
-  * add _id of copy to list of document.__versions
-  * and increment __version number
-  **/
-  static version(id){
-    return this.findById(id).exec().then(ModelVersioning.saveDiff.bind(this));
-  }
 
+    /**
+     * Idea is that you first save or update your doc
+     * then you run Doc.version(_id_of_just_saved_doc)
+     * and it will create archived copy of current document,
+     * add _id of copy to list of document.__versions
+     * and increment __version number
+     **/
+    static version(id) {
+        return this.findById(id)
+            .exec()
+            .then(ModelVersioning.saveDiff.bind(this));
+    }
 }
 
 ModelVersioning.ERR_NO_PREVIOUS_VERSIONS = ERR_NO_PREVIOUS_VERSIONS;

package/src/obsolete.js

@@ -1,10 +1,14 @@
-const log = require('not-log')(module, 'Auth');
+const log = require("not-log")(module, "Auth");
 
-module.exports = function(rule, url = ''){
-  if (Object.prototype.hasOwnProperty.call(rule, 'user')){
-    log.error(`Missformed rule, field "user" is not allowed, use "auth" instead: ${url}`);
-  }
-  if (Object.prototype.hasOwnProperty.call(rule, 'admin')){
-    log.error(`Missformed rule, field "admin" is obsolete, use "root" instead: ${url}`);
-  }
+module.exports = function (rule, url = "") {
+    if (Object.prototype.hasOwnProperty.call(rule, "user")) {
+        log.error(
+            `Missformed rule, field "user" is not allowed, use "auth" instead: ${url}`
+        );
+    }
+    if (Object.prototype.hasOwnProperty.call(rule, "admin")) {
+        log.error(
+            `Missformed rule, field "admin" is obsolete, use "root" instead: ${url}`
+        );
+    }
 };

package/src/parser.js

@@ -1,4 +1,4 @@
-const {objHas} = require('./common');
+const { objHas } = require("./common");
 
 /** @module Parser */
 
@@ -11,18 +11,20 @@ const {objHas} = require('./common');
  *        record[fieldName]   -   is for client side mostly, shows what model field walue should be placed there. Samples ':record[_id]', ':record[authorId]'
  *  @return {string}        resolved line
  */
-module.exports.parseLine = function(line, modelName, actionName) {
-  var recStart = ':record[',
-    recEnd = ']';
-  //remove client-side markers and replace them with name of field. :record[_id] turns into :_id
-  while(line.indexOf(recStart) > -1) {
-    line = line.replace(recStart, ':');
-    line = line.replace(recEnd, '');
-  }
-  //place server-side markers
-  if(typeof modelName !== 'undefined') line = line.replace(':modelName', modelName);
-  if(typeof actionName !== 'undefined') line = line.replace(':actionName', actionName);
-  return line;
+module.exports.parseLine = function (line, modelName, actionName) {
+    var recStart = ":record[",
+        recEnd = "]";
+    //remove client-side markers and replace them with name of field. :record[_id] turns into :_id
+    while (line.indexOf(recStart) > -1) {
+        line = line.replace(recStart, ":");
+        line = line.replace(recEnd, "");
+    }
+    //place server-side markers
+    if (typeof modelName !== "undefined")
+        line = line.replace(":modelName", modelName);
+    if (typeof actionName !== "undefined")
+        line = line.replace(":actionName", actionName);
+    return line;
 };
 
 /**
@@ -34,13 +36,18 @@ module.exports.parseLine = function(line, modelName, actionName) {
  *  @param  {object}  actionData  data from manifest for this action
  *  @return  {string}        resolved router line
  */
-module.exports.getRouteLine = function(url, modelName, actionName, actionData) {
-  let part1 = this.parseLine(url, modelName, actionName),
-    part2 = '';
-  if(objHas(actionData,'postFix')){
-    part2 =  this.parseLine(actionData.postFix, modelName, actionName);
-  }else{
-    part2 = '';
-  }
-  return part1 + part2;
+module.exports.getRouteLine = function (
+    url,
+    modelName,
+    actionName,
+    actionData
+) {
+    let part1 = this.parseLine(url, modelName, actionName),
+        part2 = "";
+    if (objHas(actionData, "postFix")) {
+        part2 = this.parseLine(actionData.postFix, modelName, actionName);
+    } else {
+        part2 = "";
+    }
+    return part1 + part2;
 };

package/src/repos.js

@@ -1,37 +1,35 @@
 /** @module Repos */
 
 module.exports = {
-  default: {
-    url: 'https://github.com/interrupter/not-project.git',
-    dir:  './',
-    clear:{
-      dirs: ['.git'],
-      files: ['package-lock.json'],
-    },
-    exec: {
-      after: ['init.sh']
-    }
-  },
-  gallery: {
-    extends: ['default'],
-    dir:  './',
-    url:'https://github.com/interrupter/not-project-gallery.git',
-    clear: {
-      dirs: ['.git'],
-      files: ['.gitignore'],
+    default: {
+        url: "https://github.com/interrupter/not-project.git",
+        dir: "./",
+        clear: {
+            dirs: [".git"],
+            files: ["package-lock.json"],
+        },
+        exec: {
+            after: ["init.sh"],
+        },
     },
-    use: [
-      {
-        url: 'https://github.com/interrupter/not-store.git',
-        dir: 'server/app/modules',
+    gallery: {
+        extends: ["default"],
+        dir: "./",
+        url: "https://github.com/interrupter/not-project-gallery.git",
         clear: {
-          dirs: ['.git'],
-          files: ['.gitignore'],
-        }
-      },
-    ],
-    npm: [
-      'not-store'
-    ]
-  }
+            dirs: [".git"],
+            files: [".gitignore"],
+        },
+        use: [
+            {
+                url: "https://github.com/interrupter/not-store.git",
+                dir: "server/app/modules",
+                clear: {
+                    dirs: [".git"],
+                    files: [".gitignore"],
+                },
+            },
+        ],
+        npm: ["not-store"],
+    },
 };

package/src/rollup.js

@@ -1,79 +1,89 @@
 /** @module Rollup */
 
 // Rollup plugins
-import babel from 'rollup-plugin-babel';
-import eslint from 'rollup-plugin-eslint';
-import commonjs from 'rollup-plugin-commonjs';
-import resolve from 'rollup-plugin-node-resolve';
-import replace from 'rollup-plugin-replace';
-import uglify from 'rollup-plugin-uglify';
-import filesize from 'rollup-plugin-filesize';
-import postcss from 'rollup-plugin-postcss';
+import babel from "rollup-plugin-babel";
+import eslint from "rollup-plugin-eslint";
+import commonjs from "rollup-plugin-commonjs";
+import resolve from "rollup-plugin-node-resolve";
+import replace from "rollup-plugin-replace";
+import uglify from "rollup-plugin-uglify";
+import filesize from "rollup-plugin-filesize";
+import postcss from "rollup-plugin-postcss";
 
 // PostCSS plugins
-import simplevars from 'postcss-simple-vars';
-import nested from 'postcss-nested';
-import cssnext from 'postcss-cssnext';
-import envReplace from 'postcss-env-replace';
-import cssnano from 'cssnano';
+import simplevars from "postcss-simple-vars";
+import nested from "postcss-nested";
+import cssnext from "postcss-cssnext";
+import envReplace from "postcss-env-replace";
+import cssnano from "cssnano";
 
 let replacerOpts = {
-    ENV: JSON.stringify(process.env.NODE_ENV || 'development')
-  },
-  baseHost = replacerOpts.ROLLUP_ENV_PORT+'://'+replacerOpts.ROLLUP_ENV_HOST+':'+replacerOpts.ROLLUP_ENV_PORT+'/editor';
+        ENV: JSON.stringify(process.env.NODE_ENV || "development"),
+    },
+    baseHost =
+        replacerOpts.ROLLUP_ENV_PORT +
+        "://" +
+        replacerOpts.ROLLUP_ENV_HOST +
+        ":" +
+        replacerOpts.ROLLUP_ENV_PORT +
+        "/editor";
 
-if (['production', 'stage', 'develpment'].indexOf(process.env.NODE_ENV)>-1){
-  replacerOpts = Object.assign(replacerOpts, replaceSets[process.env.NODE_ENV]);
-}else{
-  replacerOpts = Object.assign(replacerOpts, replaceSets.development);
+if (["production", "stage", "develpment"].indexOf(process.env.NODE_ENV) > -1) {
+    replacerOpts = Object.assign(
+        replacerOpts,
+        replaceSets[process.env.NODE_ENV]
+    );
+} else {
+    replacerOpts = Object.assign(replacerOpts, replaceSets.development);
 }
 
 export default {
-  input: 'src/client/app.js',
-  output: {
-    file:'build/client/core.js',
-    format: 'iife'
-  },
-  name: 'Project',
-  sourceMap: false && (process.env.NODE_ENV === 'production' ? false : 'inline'),
-  plugins: [
-    postcss({
-      plugins: [
-        envReplace({
-          environment: process.env.NODE_ENV || 'development',
-          replacements: {
-            BASE_URL: {
-              stage:     baseHost,
-              production: baseHost,
-              development:baseHost
-            }
-          }
+    input: "src/client/app.js",
+    output: {
+        file: "build/client/core.js",
+        format: "iife",
+    },
+    name: "Project",
+    sourceMap:
+        false && (process.env.NODE_ENV === "production" ? false : "inline"),
+    plugins: [
+        postcss({
+            plugins: [
+                envReplace({
+                    environment: process.env.NODE_ENV || "development",
+                    replacements: {
+                        BASE_URL: {
+                            stage: baseHost,
+                            production: baseHost,
+                            development: baseHost,
+                        },
+                    },
+                }),
+                simplevars(),
+                nested(),
+                cssnext({
+                    warnForDuplicates: false,
+                }),
+                cssnano(),
+            ],
+            extensions: [".css"],
         }),
-        simplevars(),
-        nested(),
-        cssnext({
-          warnForDuplicates: false,
+        resolve({
+            jsnext: true,
+            main: true,
+            browser: true,
         }),
-        cssnano(),
-      ],
-      extensions: ['.css'],
-    }),
-    resolve({
-      jsnext: true,
-      main: true,
-      browser: true
-    }),
-    commonjs(),
-    eslint({
-      exclude: ['build/**', 'src/css/**'],
-      rules:{"useless-escape": "off"}
-
-    }),
-    replace(replacerOpts),
-    (process.env.NODE_ENV === 'production' && babel({
-      exclude: ['build/**']
-    })),
-    (process.env.NODE_ENV === 'production' && uglify()),
-    filesize()
-  ]
+        commonjs(),
+        eslint({
+            exclude: ["build/**", "src/css/**"],
+            rules: { "useless-escape": "off" },
+        }),
+        replace(replacerOpts),
+        process.env.NODE_ENV === "production" &&
+            babel({
+                exclude: ["build/**"],
+            }),
+        process.env.NODE_ENV === "production" && uglify(),
+        filesize(),
+    ],
 };