mythix-orm 1.0.1 → 1.0.4

package/lib/connection/connection-base.js

@@ -228,7 +228,7 @@ class ConnectionBase extends EventEmitter {
 
   escape(field, _value) {
     var value = _value;
-    if (value instanceof Literals.LiteralBase)
+    if (LiteralBase.isLiteral(value))
       return value.toString(this);
 
     value = field.type.serialize(value, this);
@@ -256,14 +256,14 @@ class ConnectionBase extends EventEmitter {
   }
 
   escapeID(value) {
-    if (value instanceof Literals.LiteralBase)
+    if (LiteralBase.isLiteral(value))
       return value.toString(this.connection);
 
     return this._escapeID(value);
   }
 
   _averageLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -274,7 +274,7 @@ class ConnectionBase extends EventEmitter {
   }
 
   _countLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -285,7 +285,7 @@ class ConnectionBase extends EventEmitter {
   }
 
   _distinctLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -296,7 +296,7 @@ class ConnectionBase extends EventEmitter {
   }
 
   _maxLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -307,7 +307,7 @@ class ConnectionBase extends EventEmitter {
   }
 
   _minLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -318,7 +318,7 @@ class ConnectionBase extends EventEmitter {
   }
 
   _sumLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let queryGenerator = this.getQueryGenerator();
@@ -329,19 +329,19 @@ class ConnectionBase extends EventEmitter {
   }
 
   literalToString(literal) {
-    if (literal instanceof Literals.AverageLiteral)
+    if (Literals.AverageLiteral.isLiteralType(literal))
       return this._averageLiteralToString(literal);
-    else if (literal instanceof Literals.CountLiteral)
+    else if (Literals.CountLiteral.isLiteralType(literal))
       return this._countLiteralToString(literal);
-    else if (literal instanceof Literals.DistinctLiteral)
+    else if (Literals.DistinctLiteral.isLiteralType(literal))
       return this._distinctLiteralToString(literal);
-    else if (literal instanceof Literals.MaxLiteral)
+    else if (Literals.MaxLiteral.isLiteralType(literal))
       return this._maxLiteralToString(literal);
-    else if (literal instanceof Literals.MinLiteral)
+    else if (Literals.MinLiteral.isLiteralType(literal))
       return this._minLiteralToString(literal);
-    else if (literal instanceof Literals.SumLiteral)
+    else if (Literals.SumLiteral.isLiteralType(literal))
       return this._sumLiteralToString(literal);
-    else if (literal instanceof Literals.Literal)
+    else if (Literals.Literal.isLiteralType(literal))
       return literal.toString(this);
 
     throw new Error(`${this.constructor.name}::literalToString: Unsupported literal ${literal}.`);
@@ -423,35 +423,35 @@ class ConnectionBase extends EventEmitter {
   }
 
   typeToString(type, options) {
-    if (type instanceof Types.BigIntType)
+    if (Types.BigIntType.isSameType(type))
       return this._bigintTypeToString(type, options);
-    else if (type instanceof Types.BlobType)
+    else if (Types.BlobType.isSameType(type))
       return this._blobTypeToString(type, options);
-    else if (type instanceof Types.BooleanType)
+    else if (Types.BooleanType.isSameType(type))
       return this._booleanTypeToString(type, options);
-    else if (type instanceof Types.CharType)
+    else if (Types.CharType.isSameType(type))
       return this._charTypeToString(type, options);
-    else if (type instanceof Types.DateType)
+    else if (Types.DateType.isSameType(type))
       return this._dateTypeToString(type, options);
-    else if (type instanceof Types.DateTimeType)
+    else if (Types.DateTimeType.isSameType(type))
       return this._datetimeTypeToString(type, options);
-    else if (type instanceof Types.FloatType)
+    else if (Types.FloatType.isSameType(type))
       return this._floatTypeToString(type, options);
-    else if (type instanceof Types.IntegerType)
+    else if (Types.IntegerType.isSameType(type))
       return this._integerTypeToString(type, options);
-    else if (type instanceof Types.StringType)
+    else if (Types.StringType.isSameType(type))
       return this._stringTypeToString(type, options);
-    else if (type instanceof Types.TextType)
+    else if (Types.TextType.isSameType(type))
       return this._textTypeToString(type, options);
-    else if (type instanceof Types.UUIDV1Type)
+    else if (Types.UUIDV1Type.isSameType(type))
       return this._uuidV1TypeToString(type, options);
-    else if (type instanceof Types.UUIDV3Type)
+    else if (Types.UUIDV3Type.isSameType(type))
       return this._uuidV3TypeToString(type, options);
-    else if (type instanceof Types.UUIDV4Type)
+    else if (Types.UUIDV4Type.isSameType(type))
       return this._uuidV4TypeToString(type, options);
-    else if (type instanceof Types.UUIDV5Type)
+    else if (Types.UUIDV5Type.isSameType(type))
       return this._uuidV5TypeToString(type, options);
-    else if (type instanceof Types.XIDType)
+    else if (Types.XIDType.isSameType(type))
       return this._xidTypeToString(type, options);
 
     throw new Error(`${this.constructor.name}::typeToString: Unsupported type ${type}.`);
@@ -715,7 +715,7 @@ class ConnectionBase extends EventEmitter {
     let inputIsArray = false;
     if (!Array.isArray(models)) {
       if (!models._mythixPreparedModels) {
-        if (models instanceof Map || models instanceof Set)
+        if (Nife.instanceOf(models, 'map', 'set'))
           inputIsArray = true;
 
         models = Nife.toArray(models).filter(Boolean);

package/lib/connection/literals/literal-base.js

@@ -3,6 +3,38 @@
 const ModelUtils = require('../../utils/model-utils');
 
 class LiteralBase {
+  static _isMythixLiteral = true;
+
+  static isLiteralClass(value) {
+    if (!value)
+      return false;
+
+    if (value.prototype instanceof LiteralBase)
+      return true;
+
+    if (value._isMythixLiteral)
+      return true;
+
+    return false;
+  }
+
+  static isLiteral(value) {
+    if (!value)
+      return false;
+
+    if (value instanceof LiteralBase)
+      return true;
+
+    if (value.constructor && value.constructor._isMythixLiteral)
+      return true;
+
+    return false;
+  }
+
+  static isLiteralType(value) {
+    return (this.isLiteral(value) && value.constructor && value.constructor.name === this.name);
+  }
+
   constructor(literal, options) {
     Object.defineProperties(this, {
       'literal': {
@@ -21,7 +53,7 @@ class LiteralBase {
   }
 
   fullyQualifiedNameToDefinition(fullyQualifiedName) {
-    if (fullyQualifiedName instanceof LiteralBase)
+    if (LiteralBase.isLiteral(fullyQualifiedName))
       return fullyQualifiedName;
 
     if (!fullyQualifiedName)
@@ -44,7 +76,7 @@ class LiteralBase {
   }
 
   definitionToField(connection, definition) {
-    if (definition instanceof LiteralBase)
+    if (LiteralBase.isLiteral(definition))
       return definition;
 
     let field = connection.getField(definition.fieldNames[0], definition.modelName);

package/lib/connection/query-generator-base.js

@@ -158,7 +158,7 @@ class QueryGeneratorBase {
       if (!field)
         continue;
 
-      if (field instanceof LiteralBase) {
+      if (LiteralBase.isLiteral(field)) {
         let result          = field.toString(this.connection);
         let projectionField = this.parseFieldProjection(result, true);
         if (projectionField === result) {
@@ -195,8 +195,8 @@ class QueryGeneratorBase {
       // the list of projected fields (required
       // by some databases)
       const distinctSortOrder = (a, b) => {
-        let x           = (a instanceof LiteralBase);
-        let y           = (b instanceof LiteralBase);
+        let x           = LiteralBase.isLiteral(a);
+        let y           = LiteralBase.isLiteral(b);
         let xStr        = (x) ? a.toString(this.connection) : a;
         let yStr        = (y) ? b.toString(this.connection) : b;
         let xIsDistinct = (typeof xStr === 'string' && LITERAL_IS_DISTINCT_RE.test(xStr));
@@ -254,7 +254,7 @@ class QueryGeneratorBase {
       for (let i = 0, il = fields.length; i < il; i++) {
         let field = fields[i];
 
-        if (field instanceof LiteralBase)
+        if (LiteralBase.isLiteral(field))
           return true;
 
         if (ModelBase.isModelClass(field))
@@ -360,7 +360,7 @@ class QueryGeneratorBase {
 
         let lastField = result[result.length - 1];
 
-        if (lastField instanceof LiteralBase)
+        if (LiteralBase.isLiteral(lastField))
           result = [ lastField ];
         else if (typeof lastField === 'string')
           result = [ lastField ];
@@ -433,10 +433,10 @@ class QueryGeneratorBase {
         continue;
       }
 
-      if (projectionValue instanceof LiteralBase) {
+      if (LiteralBase.isLiteral(projectionValue)) {
         // If we already have distinct specified on the query
         // then skip any distinct values specified by the user
-        if (hasDistinct && projectionValue instanceof Literals.DistinctLiteral)
+        if (hasDistinct && Literals.DistinctLiteral.isLiteralType(projectionValue))
           continue;
 
         let key = projectionValue.toString(this.connection);
@@ -562,7 +562,7 @@ class QueryGeneratorBase {
       if (!projectionField)
         continue;
 
-      if (projectionField instanceof LiteralBase) {
+      if (LiteralBase.isLiteral(projectionField)) {
         let result = projectionField.toString(this.connection);
         let fullFieldName = this.parseFieldProjection(result);
         if (!fullFieldName)
@@ -647,7 +647,7 @@ class QueryGeneratorBase {
     if (!order)
       return order;
 
-    if (order instanceof LiteralBase)
+    if (LiteralBase.isLiteral(order))
       return order;
 
     // Is this a field?
@@ -705,11 +705,11 @@ class QueryGeneratorBase {
         order = queryPart.value;
     }
 
-    if (Nife.isNotEmpty(order) && !(order instanceof LiteralBase)) {
+    if (Nife.isNotEmpty(order) && !LiteralBase.isLiteral(order)) {
       let allModels = this.getAllModelsUsedInQuery(queryEngine, options);
 
       order = order.map((_fieldName) => {
-        if (_fieldName instanceof LiteralBase)
+        if (LiteralBase.isLiteral(_fieldName))
           return _fieldName;
 
         let { fieldName, direction } = this.getFieldDirectionSpecifier(_fieldName);
@@ -771,13 +771,13 @@ class QueryGeneratorBase {
   }
 
   _averageLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = literal.definitionToField(this.connection, literal.definition);
     let escapedFieldName;
 
-    if (field instanceof LiteralBase)
+    if (LiteralBase.isLiteral(field))
       escapedFieldName = field.toString(this.connection);
     else
       escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
@@ -786,14 +786,14 @@ class QueryGeneratorBase {
   }
 
   _countLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = (literal.definition) ? literal.definitionToField(this.connection, literal.definition) : null;
     let escapedFieldName;
 
     if (field) {
-      if (field instanceof LiteralBase)
+      if (LiteralBase.isLiteral(field))
         escapedFieldName = field.toString(this.connection);
       else
         escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
@@ -805,24 +805,24 @@ class QueryGeneratorBase {
   }
 
   _distinctLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = literal.definitionToField(this.connection, literal.definition);
-    if (field instanceof LiteralBase)
+    if (LiteralBase.isLiteral(field))
       return `DISTINCT ${field.toString(this.connection)}`;
 
     return `DISTINCT ${this.getEscapedProjectionName(field.Model, field, literal.options)}`;
   }
 
   _maxLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = literal.definitionToField(this.connection, literal.definition);
     let escapedFieldName;
 
-    if (field instanceof LiteralBase)
+    if (LiteralBase.isLiteral(field))
       escapedFieldName = field.toString(this.connection);
     else
       escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
@@ -831,13 +831,13 @@ class QueryGeneratorBase {
   }
 
   _minLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = literal.definitionToField(this.connection, literal.definition);
     let escapedFieldName;
 
-    if (field instanceof LiteralBase)
+    if (LiteralBase.isLiteral(field))
       escapedFieldName = field.toString(this.connection);
     else
       escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);
@@ -846,13 +846,13 @@ class QueryGeneratorBase {
   }
 
   _sumLiteralToString(literal) {
-    if (!literal || !(literal instanceof LiteralBase))
+    if (!literal || !LiteralBase.isLiteral(literal))
       return;
 
     let field = literal.definitionToField(this.connection, literal.definition);
     let escapedFieldName;
 
-    if (field instanceof LiteralBase)
+    if (LiteralBase.isLiteral(field))
       escapedFieldName = field.toString(this.connection);
     else
       escapedFieldName = this.getEscapedColumnName(field.Model, field, literal.options);

package/lib/field.js

@@ -1,6 +1,34 @@
 'use strict';
 
 class Field {
+  static _isMythixField = true;
+
+  static isFieldClass(value) {
+    if (!value)
+      return false;
+
+    if (value.prototype instanceof Field)
+      return true;
+
+    if (value._isMythixField)
+      return true;
+
+    return false;
+  }
+
+  static isField(value) {
+    if (!value)
+      return false;
+
+    if (value instanceof Field)
+      return true;
+
+    if (value.constructor && value.constructor._isMythixField)
+      return true;
+
+    return false;
+  }
+
   constructor(fieldDefinition) {
     Object.assign(this, fieldDefinition || {});
   }

package/lib/model.js

@@ -516,7 +516,7 @@ class Model {
       if (!field)
         return;
 
-      if (field instanceof Field) {
+      if (Field.isField(field)) {
         let clonedField = field.clone();
 
         if (Type.isType(clonedField.type)) {
@@ -602,7 +602,7 @@ class Model {
 
       field.Model = ModelClass;
 
-      if (!(field instanceof Field))
+      if (!Field.isField(field))
         field = new Field(field);
 
       if (field.primaryKey)
@@ -1227,7 +1227,7 @@ class Model {
       try {
         let fieldValue  = this[fieldName];
         let promise     = field.validate.call(this, fieldValue, context);
-        if (!(promise instanceof Promise))
+        if (!Nife.instanceOf(promise, 'promise'))
           promise = Promise.resolve(promise);
 
         promises.push(promise);

package/lib/query-engine/model-scope.js

@@ -115,7 +115,7 @@ class ModelScope extends QueryEngineBase {
         return;
 
       // Pass literals directly through
-      if (value instanceof LiteralBase)
+      if (LiteralBase.isLiteral(value))
         return value;
 
       // Is the projection a model?

package/lib/types/concrete/datetime-type.js

@@ -53,7 +53,7 @@ class DateTimeType extends Type {
     if (value == null)
       return (connection) ? null : value;
 
-    if (!(value instanceof moment))
+    if (!moment.isMoment(value))
       value = this.deserialize(value);
 
     if (connection)

package/lib/types/type.js

@@ -35,6 +35,10 @@ class Type {
     return false;
   }
 
+  static isSameType(value) {
+    return (this.isType(value) && value.constructor && value.constructor.name === this.name);
+  }
+
   static instantiateType(_type) {
     let type = _type;
     if (!type)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "ORM for Mythix framework",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -45,7 +45,7 @@
     "events": "^3.3.0",
     "inflection": "^1.13.2",
     "moment": "^2.29.3",
-    "nife": "^1.11.2",
+    "nife": "^1.11.3",
     "sqlstring": "^2.3.3",
     "uuid": "^8.3.2",
     "xid-js": "^1.0.1"

package/.eslintrc.js

@@ -1,94 +0,0 @@
-'use strict';
-
-/* eslint-disable no-magic-numbers */
-
-module.exports = {
-  'env': {
-    'browser':  true,
-    'commonjs': true,
-    'es2021':   true,
-  },
-  'extends': [
-    'eslint:recommended',
-  ],
-  'parserOptions': {
-    'ecmaVersion': 'latest',
-  },
-  'plugins': [
-    '@spothero/eslint-plugin-spothero',
-  ],
-  'rules': {
-    '@spothero/spothero/ternary-parentheses': 'error',
-    'arrow-parens':                           'error',
-    'arrow-spacing':                          [ 'error', { before: true, after: true } ],
-    'block-scoped-var':                       'warn',
-    'block-spacing':                          'error',
-    'brace-style':                            [ 'error', '1tbs' ],
-    'camelcase':                              'warn',
-    'comma-dangle':                           [ 'error', 'always-multiline' ],
-    'comma-spacing':                          [ 'error', { before: false, after: true } ],
-    'comma-style':                            [ 'error', 'last' ],
-    'curly':                                  [ 'error', 'multi-or-nest', 'consistent' ],
-    'default-case-last':                      'error',
-    'default-param-last':                     'error',
-    'eqeqeq':                                 [ 'error', 'smart' ],
-    'func-call-spacing':                      [ 'error', 'never' ],
-    'guard-for-in':                           'error',
-    'implicit-arrow-linebreak':               [ 'error', 'beside' ],
-    'indent':                                 [ 'error', 2, { 'SwitchCase': 1, 'MemberExpression': 'off' } ],
-    'jsx-quotes':                             [ 'error', 'prefer-double' ],
-    'key-spacing':                            [ 'error', { beforeColon: false, afterColon: true, mode: 'minimum', 'align': 'value' } ],
-    'keyword-spacing':                        [ 'error', { before: true, after: true } ],
-    'linebreak-style':                        [ 'error', 'unix' ],
-    'lines-between-class-members':            'error',
-    'max-classes-per-file':                   [ 'error', 3 ],
-    'new-cap':                                [ 'error', { 'properties': false } ],
-    'new-parens':                             'error',
-    'no-array-constructor':                   'warn',
-    'no-caller':                              'error',
-    'no-confusing-arrow':                     'error',
-    'no-empty':                               'warn',
-    'no-eq-null':                             0,
-    'no-eval':                                'error',
-    'no-extend-native':                       'error',
-    'no-extra-label':                         'error',
-    'no-floating-decimal':                    'error',
-    'no-global-assign':                       'error',
-    'no-implied-eval':                        'error',
-    'no-labels':                              'error',
-    'no-lone-blocks':                         'warn',
-    'no-loop-func':                           0,
-    'no-magic-numbers':                       [ 'warn', { ignoreArrayIndexes: true, ignoreDefaultValues: true, ignore: [ -1, 0, 1, 2, 16, 32, 64, 128, 256, 1024, 2048, 200, 301, 302, 400, 401, 404, 500 ] } ],
-    'no-nested-ternary':                      'error',
-    'no-param-reassign':                      'error',
-    'no-promise-executor-return':             'error',
-    'no-return-assign':                       'error',
-    'no-sequences':                           'error',
-    'no-shadow':                              0,
-    'no-throw-literal':                       'warn',
-    'no-trailing-spaces':                     'error',
-    'no-unmodified-loop-condition':           'warn',
-    'no-unreachable-loop':                    'warn',
-    'no-unreachable':                         'warn',
-    'no-unused-private-class-members':        'warn',
-    'no-unused-vars':                         'warn',
-    'no-whitespace-before-property':          'error',
-    'nonblock-statement-body-position':       [ 'error', 'below' ],
-    'one-var':                                [ 'error', 'never' ],
-    'quotes':                                 [ 'error', 'single' ],
-    'radix':                                  'error',
-    'rest-spread-spacing':                    [ 'error', 'never' ],
-    'semi-spacing':                           [ 'error', { before: false, after: true } ],
-    'semi-style':                             [ 'error', 'last' ],
-    'semi':                                   'error',
-    'space-before-blocks':                    'error',
-    'space-infix-ops':                        'error',
-    'space-unary-ops':                        [ 'error', { words: false, nonwords: false } ],
-    'strict':                                 'error',
-    'switch-colon-spacing':                   [ 'error', { before: false, after: true } ],
-    'template-curly-spacing':                 'error',
-    'template-tag-spacing':                   'error',
-    'wrap-iife':                              [ 'error', 'inside' ],
-    'yoda':                                   'error',
-  },
-};

package/.vscode/launch.json

@@ -1,34 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "pwa-node",
-      "request": "launch",
-      "name": "Debug Unit Tests",
-      "skipFiles": [
-        "<node_internals>/**",
-        "node_modules/**/*.js",
-        "**/node_modules/**",
-        "async_hooks.js",
-        "inspector_async_hook.js"
-      ],
-      "program": "${workspaceFolder}/node_modules/.bin/jasmine",
-    },
-    {
-      "type": "pwa-node",
-      "request": "launch",
-      "name": "Playground Test 01",
-      "skipFiles": [
-        "<node_internals>/**",
-        "node_modules/**/*.js",
-        "**/node_modules/**",
-        "async_hooks.js",
-        "inspector_async_hook.js"
-      ],
-      "program": "${workspaceFolder}/playground/test01.js",
-    }
-  ]
-}

package/.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-  "workbench.colorCustomizations": {
-    "activityBar.background": "#1E3313",
-    "titleBar.activeBackground": "#2A471A",
-    "titleBar.activeForeground": "#F8FBF6"
-  },
-  "cSpell.words": [
-    "autoincrement"
-  ]
-}

package/playground/test01.js

@@ -1,15 +0,0 @@
-'use strict';
-
-class _Test {
-
-}
-
-const Test = new Proxy(_Test, {
-  set(obj, prop, value) {
-    console.log('Setting: ', obj, prop, value);
-  },
-});
-
-class Test2 extends Test {
-  fields = { derp: true };
-}