@makano/rew 1.2.91 → 1.2.93

package/lib/rew/functions/types.js

@@ -59,26 +59,27 @@ function typef(fn, returnType) {
 		return result;
 	}
 	wrappedFn.returnType = returnType;
+	wrappedFn.type = returnType;
 	return wrappedFn;
 }
 typef.is = function(func, returnType){
 	return typeis(func.returnType.defaultValue, returnType);
 }
 
-function typeis(obj, typeDef) {
+function typeis(obj, typeDef, missingObjects = false) {
 	// Resolve Type
 	if (typeof typeDef == 'function' && typeDef.type instanceof Type) typeDef = typeDef.type;
 
 	if (typeDef.isConstucted && typeDef.class && !(obj instanceof typeDef.class)) {
-		return false;
+		return missingObjects ? [false] : false;
 	}
 
 	if (getType(obj) == 'object' && typeDef.type == 'function') {
-		return obj instanceof typeDef.class;
+		return missingObjects ? [obj instanceof typeDef.class] : obj instanceof typeDef.class;
 	}
 
 	if (getType(obj) !== typeDef.type) {
-		return false;
+		return missingObjects ? [false] : false;
 	}
 
 	if (!typeDef.isEmpty) {
@@ -90,14 +91,28 @@ function typeis(obj, typeDef) {
 
 				if (typeof propTypeDef === 'object') {
 					if (!typeis(obj[key], propTypeDef)) {
-						return false;
+						return missingObjects ? [false, {
+							[key]: {
+								type_mismatch: propTypeDef,
+								given: obj[gen_key]
+							}
+						}] : false;
 					}
-				} else if (typeof obj[key] !== propTypeDef) {
-					return false;
+				} else if (typeof obj[key] !== typeof propTypeDef) {
+					return missingObjects ? [false, {
+						[key]: obj[key] ? {
+							type_mismatch: typeof propTypeDef,
+							given: typeof obj[key]
+						} : {
+							not_found: true
+						}
+					}] : false;
 				}
 			}
 			if (typeDef.strict) {
-				if (Object.keys(obj).some((key) => !Object.keys(typeDef.defaultValue).includes(key))) return false;
+				if (Object.keys(obj).some((key) => !Object.keys(typeDef.defaultValue).includes(key))) return missingObjects ?
+					[false, Object.fromEntries(Object.keys(obj).filter((key) => !Object.keys(typeDef.defaultValue).includes(key)).map((key) => [key, { is_extra: true }]))]
+				: false;
 			}
 		} else if (typeDef.type == 'string') {
 			return typeDef.defaultValue == obj;
@@ -106,7 +121,7 @@ function typeis(obj, typeDef) {
 		}
 	}
 
-	return true;
+	return missingObjects ? [true] : true;
 }
 
 function typex(child, parent) {

package/lib/rew/modules/compiler.js

@@ -86,6 +86,15 @@ function tokenizeCoffeeScript(code) {
       }
       tokens.push({ type: 'IDENTIFIER', value: identifier });
       i--; // Move back one character to recheck
+    } else if (/[a-f0-9.n]/.test(char)) {
+      let num = char;
+      i++;
+      while (i < code.length && /[a-f0-9.n]/.test(code[i])) {
+        num += code[i];
+        i++;
+      }
+      tokens.push({ type: 'NUMBER', value: num });
+      i--; // Move back one character to recheck
     } else {
       // Other characters
       tokens.push({ type: 'OTHER', value: char });
@@ -172,7 +181,7 @@ function declareAlias(aliases, token) {
 					let nextToken = gnextToken(index, offset+1, tokens);
 					const args = nextToken.token.value;
 					setIndex(ti + offset);
-					return `${nextToken2.value} = ${token.value} ${args && args !== '(' ? `${args},` : ''} ${params.trim()}, ${args == '(' ? args : ''}`;
+					return `${nextToken2.value} = ${token.value} ${args && args !== '(' && args !== '{' && args !== '[' && args !== '-' && args !== '=' ? `${args},` : ''} ${params.trim() ? params.trim() + ', ' : ''}${args == '(' || args == '[' || args == '{' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -573,6 +582,8 @@ const compileCivetStuff = (file, options) => {
 	straceLog('OPTION_PREPARE() for CURRENTFILE as', preCompileOptions);
 	const prepared = compileRewStuff(file.content, preCompileOptions);
 
+	// console.log(prepared);
+
 	const compileOptions = {
 		...preCompileOptions,
 		bare: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makano/rew",
-  "version": "1.2.91",
+  "version": "1.2.93",
   "description": "A simple coffescript runtime and app manager",
   "main": "main.js",
   "directories": {