Merge pull request #8 from Codevendor/dev

Dev

README.md

@@ -110,7 +110,7 @@ Add both to your webpage for type checking. You only need to recompile with the
 
 Below are examples for using [**InferJS-Library**][inferjs-library] in your code.
 
-#### Brower ESModule Import Example - Client side
+#### Browser ESModule Import Example - Client side
 ```html
 <script type="module">
   import { InferObject } from "./inferobject.js";
@@ -214,6 +214,7 @@ Below is a list of `standard` and `extended types` that can be checked:
 | [symbol]() | A symbol type: `Symbol` |
 | [function]() | A function type: `function` |
 | **Extended InferJS Types** | **Description** |
+| [any]() | Allows Any type: `any` or `*` |
 | [array]() | An array type: `[]` |
 | [infinity]() | An infinity number type: `Infinity` |
 | [nan]() | Not a number type: `NaN` |

bin/build-test1-inferobject.js

@@ -26,8 +26,11 @@ for (let i = 0; i < keys.length; i++) {
 
 // Set command to exec for compiling InferObject
 const compiler = `node ${paths['compiler']}`;
-const cmd = `inferjs-compiler -f ${paths['input']} --output-options-flags='w' --output-options-module='esm' -o ${paths['output']}`;
+const cmd = `${compiler} -f ${paths['input']} --output-options-flags='w' --output-options-module='esm' -o ${paths['output']}`;
+//const cmd = `inferjs-compiler -f ${paths['input']} --output-options-flags='w' --output-options-module='esm' -o ${paths['output']}`;
 
+//console.log(cmd);
+//process.exit();
 
 // Execute compiler to build inferobject for test1
 exec(cmd, (error, stdout, stderr) => {

package.json

@@ -1,12 +1,12 @@
 {
   "name": "inferjs-library",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "A runtime library that allows you to infer rules for extended type checking in JavaScript.",
   "main": "index.js",
   "homepage": "https://inferjs.com",
   "type": "module",
   "devDependencies": {
-    "inferjs-compiler": "^0.0.8",
+    "inferjs-compiler": "^0.0.9",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },

src/core/inferjs-library.js

@@ -83,15 +83,18 @@ export class InferJS {
     #checkMethod(inferId, args, returnException = false) {
 
         // Check if inferid exists or through error
-        if (type_of(this.#inferObject) !== 'object' || type_of(this.#inferObject.infers) !== 'object' || !this.#inferObject.infers.hasOwnProperty(inferId)) {
+        if (type_of(this.#inferObject) !== 'object' || type_of(this.#inferObject.methods) !== 'object'  || type_of(this.#inferObject.methods.infers) !== 'object' || !this.#inferObject.methods.infers.hasOwnProperty(inferId)) {
 
             const err = new TypeError(`Cannot find infer with inferid: ${inferId}`);
             if (!returnException) throw err;
             return err;
         }
 
         // Convert infer to inf for shorthand
-        const inf = this.#inferObject.infers[inferId];
+        const inf = this.#inferObject.methods.infers[inferId];
+
+        // Set inferid
+        inf["@inferid"] = inferId;
 
         // Check if has @param
         if (inf.hasOwnProperty('@param')) {
@@ -134,7 +137,7 @@ export class InferJS {
 
                     if (allowedTypes.hasOwnProperty(actualType)) {
 
-                        const infers = allowedTypes[actualType].infers;
+                        const infers = allowedTypes[actualType].expects;
                         const infersArray = Object.keys(infers);
 
                         for (let i3 = 0; i3 < infersArray.length; i3++) {

src/errors/infer-expect-error.js

@@ -18,6 +18,7 @@ export class InferExpectError extends Error {
     #expectedType = '';
     #paramPositionRepresent = '';
     #method = '';
+    #methodName = '';
     #inferId = '';
     #methodSignature = '';
     #param = '';
@@ -41,6 +42,9 @@ export class InferExpectError extends Error {
     /** Gets the method name from @function. */
     get method() { return this.#method; }
 
+    /** Gets the method name from actual code. */
+    get methodName() { return this.#methodName; }
+
     /** Gets the inferId from @inferid. */
     get inferId() { return this.#inferId; }
 
@@ -105,6 +109,7 @@ export class InferExpectError extends Error {
         this.#inferId = (inferObject.hasOwnProperty('@inferid')) ? inferObject['@inferid'] : 'Unknown';
         this.#paramPositionRepresent = numberRepresent(this.#paramPosition);
         this.#method = (inferObject.hasOwnProperty('@function')) ? inferObject['@function'] : '';
+        this.#methodName = (inferObject.hasOwnProperty('name')) ? inferObject['name'] : '';
         this.#methodSignature = this.#getMethodSignature(inferObject);
         this.#param = Object.keys(inferObject['@param'])[paramIndex];
         this.#expectedType = this.#getExpectedType(inferObject, this.#param, true);
@@ -195,7 +200,12 @@ export class InferExpectError extends Error {
     #getMethodSignature(inferObject) {
 
         // Variables
-        let sig = (inferObject.hasOwnProperty('@function')) ? inferObject['@function'] + '( ' : '( ';
+        //let sig = (inferObject.hasOwnProperty('@function')) ? inferObject['@function'] + '( ' : '( ';
+
+        let sig = '';
+        if (inferObject.hasOwnProperty('name')) { sig = inferObject['name'] + '( ' };
+        if (inferObject.hasOwnProperty('@function')) { sig = inferObject['@function'] + '( ' };
+        if (sig === '') { sig = '( '; }
 
         if (inferObject.hasOwnProperty('@param')) {
 

src/errors/infer-type-error.js

@@ -18,6 +18,7 @@ export class InferTypeError extends TypeError {
     #expectedType = '';
     #paramPositionRepresent = '';
     #method = '';
+    #methodName = '';
     #inferId = '';
     #methodSignature = '';
     #param = '';
@@ -36,6 +37,9 @@ export class InferTypeError extends TypeError {
     /** Gets the method name from @function. */
     get method() { return this.#method; }
 
+    /** Gets the method name from actual code. */
+    get methodName() { return this.#methodName; }
+
     /** Gets the inferId from @inferid. */
     get inferId() { return this.#inferId; }
 
@@ -76,6 +80,7 @@ export class InferTypeError extends TypeError {
         this.#inferId = (inferObject.hasOwnProperty('@inferid')) ? inferObject['@inferid'] : 'Unknown';
         this.#paramPositionRepresent = numberRepresent(this.#paramPosition);
         this.#method = (inferObject.hasOwnProperty('@function')) ? inferObject['@function'] : '';
+        this.#methodName = (inferObject.hasOwnProperty('name')) ? inferObject['name'] : '';
         this.#methodSignature = this.#getMethodSignature(inferObject);
         this.#param = Object.keys(inferObject['@param'])[paramIndex];
         this.#expectedType = this.#getExpectedType(inferObject, this.#param, true);
@@ -142,7 +147,10 @@ export class InferTypeError extends TypeError {
     #getMethodSignature(inferObject) {
 
         // Variables
-        let sig = (inferObject.hasOwnProperty('@function')) ? inferObject['@function'] + '( ' : '( ';
+        let sig = '';
+        if (inferObject.hasOwnProperty('name')) { sig = inferObject['name'] + '( ' };
+        if (inferObject.hasOwnProperty('@function')) { sig = inferObject['@function'] + '( ' };
+        if (sig === '') { sig = '( '; }
 
         if (inferObject.hasOwnProperty('@param')) {
 

src/helpers/type-of.js

@@ -62,11 +62,11 @@ export function type_of(src, extended = false) {
 
                         case 'arguments': return 'arguments';
                         case 'array': return 'array';
-                        case 'error': return (src.constructor.name) ? src.constructor.name : 'error';
+                        case 'error': return (src.constructor && src.constructor.name) ? src.constructor.name : 'error';
                         default:
 
                             // Check if constructor
-                            if (src.constructor.name) {
+                            if (src.constructor && src.constructor.name) {
                                 if(src.constructor.name.toLowerCase() === 'object') return 'object';
                                 return src.constructor.name;
                             } 

tests/test1.js

@@ -1,5 +1,5 @@
 import { InferObject } from "./inferobjects/test1.io.js";
-import { InferJS } from "../dist/latest/ver-0-0-4/esmodule/inferjs-0.0.4.min.js";
+import { InferJS } from "../src/core/inferjs-library.js";
 const inferjs = new InferJS(InferObject);
 
 /**
@@ -28,4 +28,4 @@ function foo(msg, id, send) {
 }
 
 // Example Normal Call
-console.log(foo('test', '-1234', true));
+console.log(foo('test', -1234, true));