@makano/rew 1.2.90 → 1.2.92

package/lib/rew/const/default.js

@@ -5,7 +5,7 @@ const future = require('../functions/future');
 const sleep = require('../functions/sleep');
 const { match } = require('../functions/match');
 const { map } = require('../functions/map');
-const { typex, typeis, typedef, typei, int, float, num, str, bool } = require('../functions/types');
+const { typex, typeis, typedef, typei, int, float, num, str, bool, typef } = require('../functions/types');
 const { isEmpty, clone, deepClone, merge, uniqueId, compose, curry, getters, setters } = require('../functions/core');
 const { print, input, clear, printf } = require('../functions/stdout');
 const { curl } = require('../functions/curl');
@@ -31,6 +31,7 @@ module.exports = {
 	typei,
 	typeis,
 	typedef,
+	typef,
 
 	int,
 	float,

package/lib/rew/functions/types.js

@@ -14,8 +14,19 @@ function getType(value) {
 	return typeof value === 'object' ? (Array.isArray(value) ? 'array' : typeof value) : typeof value;
 }
 
+class Type{
+	constructor(o){
+		for(let i in o){
+			this[i] = o[i];
+		}
+	}
+}
+
 function typedef(value, strict = false) {
-	return {
+	if(typeof value == "function" && value.type instanceof Type){
+		value = value.type;
+	}
+	return value instanceof Type ? value : new Type({
 		strict,
 		defaultValue: value,
 		class:
@@ -27,12 +38,37 @@ function typedef(value, strict = false) {
 		type: getType(value),
 		isConstucted: typeof value === 'object' && value !== null && !Array.isArray(value),
 		isEmpty: typeof value == 'object' ? !Object.keys(value).length : typeof value == 'string' ? value == '' : typeof value !== 'function',
-	};
+	});
+}
+
+function typef(fn, returnType) {
+	if(typeof returnType == "function"){
+		const ref = fn;
+		fn = returnType;
+		returnType = ref;
+	}
+	if (typeof fn !== 'function') {
+		throw new Error('First argument must be a function');
+	}
+	if (typeof returnType == 'function' && returnType.type instanceof Type) returnType = returnType.type;
+	const wrappedFn = function(...args){
+		const result = fn.call(this, ...args);
+		if(!typeis(result, wrappedFn.returnType)){
+			throw new TypeError(`Function ${fn.name || '<anonymous>'} does not return it's own return type.`);
+		}
+		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) {
 	// Resolve Type
-	if (typeof typeDef == 'function' && typeDef.type) typeDef = typeDef.type;
+	if (typeof typeDef == 'function' && typeDef.type instanceof Type) typeDef = typeDef.type;
 
 	if (typeDef.isConstucted && typeDef.class && !(obj instanceof typeDef.class)) {
 		return false;
@@ -112,6 +148,7 @@ module.exports = {
 	typei,
 	typeis,
 	typedef,
+	typef,
 
 	int,
 	float,

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 });
@@ -153,7 +162,7 @@ function declareAlias(aliases, token) {
 			aliasValue = (token, tokens, code, hooks, index, setIndex) => {
 				const nextToken = tokens[index+1]
 				let nextToken2 = gnextToken(index, 3, tokens);
-				if (nextToken.value == '(' || tokens[index+2]?.value == '(') {
+				if (nextToken?.value == '(' || tokens[index+2]?.value == '(') {
 					let params = '';
 					index += 2;
 					let openBrackets = 1;
@@ -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},` : ''} ${params.trim()}, ${args == '(' || args == '=' || args == '-' ? args : ''}`.replace(/,(| )$/, '');
 				} else if(nextToken?.value == ' ' && (isDecOnly || nextToken2?.token.value == '=' || nextToken2?.token.value == ':')){
 					nextToken.value = '';
 					if(isDecOnly){
@@ -204,7 +213,21 @@ function declareAlias(aliases, token) {
   }
 }
 
-
+const stdTypes = (isPublic) => {
+	let r = '';
+	const dec = (name, fn) => {
+		r += `#declare${isPublic?'*':''} key "=${name}" = ${fn || name};\n`
+	}
+	dec('int');
+	dec('str');
+	dec('float');
+	dec('num');
+	dec('bool');
+	dec('typedef');
+	dec('typef');
+	dec('struct');
+	return r;
+};
 const includeFile = (includeContent, options) => {
 	straceLog('INCLUDE()', includeContent);
 	const dontInclude = includeContent.startsWith('*');
@@ -212,27 +235,36 @@ const includeFile = (includeContent, options) => {
 		includeContent = includeContent.slice(1);
 		straceLog('==> IGNORING OUTPUT', includeContent);
 	};
-	let filename = options.filename ? path.resolve(path.dirname(options.filename), includeContent) : includeContent;
-	const _inc = (filename) => '\n'+ compileRewStuff(readFileSync(filename).toString(), {
-		...options,
-		filename,
-		included: true
-	})+'\n';
+	const fp = path.resolve(path.dirname(options.filename || ''), includeContent);
+	let packageName = options.filename ? (existsSync(fp) ? fp : includeContent) : includeContent;
+	const file = packageName.startsWith('./') || packageName.startsWith('../');
+	if(!(file) && packageName.match('/')) packageName = packageName.split('/').pop();
+	if(file) packageName = path.extname(packageName) ? packageName.replace(path.extname(packageName), '.h.coffee') : packageName;
+	if(file && !packageName.endsWith('.h.coffee')) packageName += '.h.coffee';
+	if(includeContent == 'std') packageName = 'std';
+
+	const _inc = (filename, c) => {
+		options.included = true;
+		options.filename = filename;
+		return '\n'+ compileRewStuff(c ? filename : readFileSync(filename).toString(), options)+'\n'
+	};
 	let r = '';
-	if (existsSync(filename)) {
-		straceLog('==> INCLUDE FILE', filename);
-		r = _inc(filename);
+	if(packageName == 'std'){
+		r = _inc(stdTypes(dontInclude), true);
+	} else if (existsSync(packageName)) {
+		straceLog('==> INCLUDE FILE', packageName);
+		r = _inc(packageName);
 	} else {
 		const packageName = includeContent.match('/') ? includeContent.split('/')[0] : includeContent;
 		const headerFile = includeContent.match('/') ? includeContent.replace(packageName+'/', '') : 'main.h.coffee';
 		const pathname = path.join(CONFIG_PATH, packageName, 'app', headerFile);
-		straceLog('==> INCLUDE PACKAGE', filename);
+		straceLog('==> INCLUDE PACKAGE', packageName);
 		if(existsSync(pathname)) r = _inc(pathname);
 	}
-	if(!dontInclude){
-		return r;	
+	if(dontInclude){
+		return 'intentional-nothing';
 	}
-	return "";
+	return r;
 }
 
 function useImp(token, options){
@@ -245,16 +277,22 @@ function useImp(token, options){
 		const value = token.value.slice(1, -1);
 		let packageName = value.slice(1);
 		token.value = dem+packageName+dem;
-		const file = packageName.startsWith('./') || packageName.startsWith('../');
-		if(!(file) && packageName.match('/')) packageName = packageName.split('/').pop();
-		if(file) packageName = path.extname(packageName) ? packageName.replace(path.extname(packageName), '.h.coffee') : packageName;
-		if(file && !packageName.endsWith('.h.coffee')) packageName += '.h.coffee';
 		straceLog('IMP() with HEADER for', packageName);
 		return includeFile(packageName, options); 
 	}
 	return '';
 }
 
+function updateAliases(aliases, o = execOptions._syntaxAliases){
+	for(let h in o){
+		for(let i in o[h]){
+			if(!aliases[h]) aliases[h] = {};
+			aliases[h][i] = o[h][i]
+		}
+	}
+	return aliases;
+}
+
 function compileRewStuff(content, options) {
 	straceLog('TOKENIZE() for CURRENTFILE');
 	const tokens = tokenizeCoffeeScript(content);
@@ -309,28 +347,6 @@ function compileRewStuff(content, options) {
 			}
 		}
 		
-		if (token.type === 'IDENTIFIER' && token.value === 'imp') {
-			straceLog('IMP() Detected');
-			let { token: t1 } = gnextToken(i, 1, tokens) || {};
-			let { token: t2 } = gnextToken(i, 2, tokens) || {};
-			let r = '';
-
-			if(t1.value == '('){
-				if(t2.type == 'STRING'){
-					r = useImp(t2, options);
-				}
-			} else if(t1.type == 'STRING'){
-				r = useImp(t1, options);
-			}
-
-			if(r) {
-				aliases = {
-					...aliases,
-					...execOptions._syntaxAliases
-				}
-			}
-		}
-
 		if (token.type === 'COMMENT' && token.value.slice(1).trim().startsWith('@jsx')) {
 			options.jsx = true;
 			straceLog('JSX() ENABLE WITH COMMENTS');
@@ -390,6 +406,7 @@ function compileRewStuff(content, options) {
 			if (nextToken.type === 'STRING') {
 				straceLog('==> SIMPLE');
 				result += `inc ${nextToken.value}`;
+				if(useImp(nameToken, options)) updateAliases(aliases);
 				i += n;
 			} else if (nextToken.value === '{') {
 				const closingBraceToken = fnextToken(ind, tokens, 'OTHER', '}');
@@ -405,6 +422,7 @@ function compileRewStuff(content, options) {
 					
 					straceLog('==>', exports, 'from', nameToken.value);
 
+					if(useImp(nameToken, options)) updateAliases(aliases);
 					result += `{ ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = nameToken.ti;
 				}
@@ -415,6 +433,7 @@ function compileRewStuff(content, options) {
 					const nextToken = fnextToken(asToken.ti + 1, tokens, 'IDENTIFIER');
 					defaultName = nextToken.value;
 					straceLog('==>', defaultName, 'from', nameToken.value);
+					if(useImp(nameToken, options)) updateAliases(aliases);
 					result += `${defaultName} ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken.value}`;
 					i = ind + 6;
 				}
@@ -433,10 +452,12 @@ function compileRewStuff(content, options) {
 							.filter((t, i, arr) => !arr[i+1]?.match(':') && !arr[i-1]?.match(':'))
 							.join(', ');
 						straceLog('==>', defaultName, 'and', exports, 'from', nameToken.value);
+						if(useImp(nameToken, options)) updateAliases(aliases);
 						result += `{ default: ${defaultName}, ${exports} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 						i = closingBraceToken.ti + 4;
 					}
 				} else {
+					if(useImp(nameToken || {}, options)) updateAliases(aliases);
 					result += `{ default: ${defaultName} } ${options.type == 'coffee' ? '=' : ':='} inc ${nameToken?.value || ''}`;
 					i = ind + 2;
 				}
@@ -464,6 +485,25 @@ function compileRewStuff(content, options) {
 			continue;
 		}
 
+		if (token.type === 'IDENTIFIER' && (token.value === 'imp' || token.value === 'inc')) {
+			straceLog('IMP() Detected');
+			let { token: t1 } = gnextToken(i, 1, tokens) || {};
+			let { token: t2 } = gnextToken(i, 2, tokens) || {};
+			let r = '';
+
+			if(t1?.value == '('){
+				if(t2?.type == 'STRING'){
+					r = useImp(t2, options);
+				}
+			} else if(t1?.type == 'STRING'){
+				r = useImp(t1, options);
+			}
+
+			if(r) {
+				updateAliases(aliases);
+			}
+		}
+
 		if (
 			token.type === 'IDENTIFIER' &&
 			token.value === 'pub' &&
@@ -516,16 +556,18 @@ function compileRewStuff(content, options) {
 		
 		if (token.type === "COMMENT" && token.value.startsWith('#include')) {
 			const includeContent = token.value.split(' ')[1].trim() || '';
-			const r = includeFile(includeContent, options);
+			const _o = {...options};
+			const r = includeFile(includeContent, _o);
 			if(r){
-				result += r;
-				aliases = {
-					...aliases,
-					...execOptions._syntaxAliases
-				}
+				result += r == 'intentional-nothing' ? '' : r;
+				updateAliases(aliases, _o.aliases);
 			}
     }
 	}
+
+	if(options.included){
+		options.aliases = aliases;
+	}
 	// console.log(aliases);
 	// console.log(result);
 	return result;

package/package.json

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