@mojir/lits 1.2.2-alpha.1 → 1.2.2-alpha.3

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "1.2.2-alpha.1";
+var version = "1.2.2-alpha.3";
 
 var AstNodeType;
 (function (AstNodeType) {
@@ -6289,15 +6289,6 @@ function evaluateNumberAsFunction(fn, params, sourceCodeInfo) {
     return toAny(param[fn]);
 }
 
-// export function findUnresolvedIdentifiersInFunction(ast, contextStack, builtin: Builtin) => {
-//   const astNodes = Array.isArray(ast) ? ast : ast.b
-//   const unresolvedIdentifiers = new Set<UnresolvedIdentifier>()
-//   for (const subNode of astNodes) {
-//     findUnresolvedIdentifiersInAstNode(subNode, contextStack, builtin)
-//       .forEach(symbol => unresolvedIdentifiers.add(symbol))
-//   }
-//   return unresolvedIdentifiers
-// }
 var findUnresolvedIdentifiers = function (ast, contextStack, builtin) {
     var e_1, _a;
     var astNodes = Array.isArray(ast) ? ast : ast.b;
@@ -8028,6 +8019,12 @@ function assertNewLineToken(token) {
         throw new LitsError("Expected newline token, got ".concat(token === null || token === void 0 ? void 0 : token.t, "."));
 }
 
+function transformTokens(tokenStram, transformer) {
+    return __assign(__assign({}, tokenStram), { tokens: tokenStram.tokens.map(function (token) {
+            return __assign(__assign({}, token), { v: transformer(token.v) });
+        }) });
+}
+
 var UnparseOptions = /** @class */ (function () {
     function UnparseOptions(unparse, lineLength, col, inlined, locked) {
         if (col === void 0) { col = 0; }
@@ -8546,6 +8543,51 @@ function unparseAst(ast, lineLength) {
     return result.trim();
 }
 
+function isNoSpaceNeededBefore(token) {
+    switch (token.t) {
+        case TokenType.Bracket:
+            return [')', ']'].includes(token.v);
+        case TokenType.CollectionAccessor:
+            return true;
+        case TokenType.NewLine:
+            return true;
+        default:
+            return false;
+    }
+}
+function isNoSpaceNeededAfter(token) {
+    switch (token.t) {
+        case TokenType.Bracket:
+            return ['(', '['].includes(token.v);
+        case TokenType.CollectionAccessor:
+            return true;
+        case TokenType.FnShorthand:
+            return true;
+        case TokenType.NewLine:
+            return true;
+        case TokenType.RegexpShorthand:
+            return true;
+        default:
+            return false;
+    }
+}
+function untokenize(tokenStream) {
+    var lastToken;
+    return tokenStream.tokens.reduce(function (acc, token) {
+        var joiner = !lastToken || isNoSpaceNeededAfter(lastToken) || isNoSpaceNeededBefore(token) ? '' : ' ';
+        lastToken = token;
+        return "".concat(acc).concat(joiner).concat(untokenizeToken(token));
+    }, '');
+}
+function untokenizeToken(token) {
+    switch (token.t) {
+        case TokenType.String:
+            return "\"".concat(token.v, "\"");
+        default:
+            return token.v;
+    }
+}
+
 var Cache = /** @class */ (function () {
     function Cache(maxSize) {
         this.cache = {};
@@ -8677,6 +8719,12 @@ var Lits = /** @class */ (function () {
         var contextStack = createContextStack(params);
         return evaluate(ast, contextStack);
     };
+    Lits.prototype.transform = function (tokenStream, transformer) {
+        return transformTokens(tokenStream, transformer);
+    };
+    Lits.prototype.untokenize = function (tokenStream) {
+        return untokenize(tokenStream);
+    };
     Lits.prototype.apply = function (fn, fnParams, params) {
         var _a;
         if (params === void 0) { params = {}; }

package/dist/cli/src/Lits/Lits.d.ts

@@ -47,6 +47,8 @@ export declare class Lits {
     tokenize(program: string, tokenizeParams?: TokenizeParams): TokenStream;
     parse(tokenStream: TokenStream): Ast;
     evaluate(ast: Ast, params: LitsParams): Any;
+    transform(tokenStream: TokenStream, transformer: (name: string) => string): TokenStream;
+    untokenize(tokenStream: TokenStream): string;
     apply(fn: LitsFunction, fnParams: unknown[], params?: LitsParams): Any;
     private generateAst;
 }

package/dist/cli/src/analyze/index.d.ts

@@ -1,7 +1,7 @@
 import type { LitsParams } from '../Lits/Lits';
 import type { Builtin } from '../builtin/interface';
 import { type ContextStack } from '../evaluator/ContextStack';
-import type { Ast, AstNode, LitsFunction } from '../parser/interface';
+import type { Ast, AstNode } from '../parser/interface';
 import type { Token } from '../tokenizer/interface';
 export interface UnresolvedIdentifier {
     symbol: string;
@@ -15,4 +15,3 @@ export interface Analysis {
 }
 export type FindUnresolvedIdentifiers = (ast: Ast | AstNode[], contextStack: ContextStack, builtin: Builtin) => UnresolvedIdentifiers;
 export declare function analyze(ast: Ast, params: LitsParams): Analysis;
-export declare function findUnresolvedIdentifiersInFunction(fun: LitsFunction, params: LitsParams): UnresolvedIdentifiers;

package/dist/cli/src/index.d.ts

@@ -14,4 +14,3 @@ export { apiReference, isDatatypeReference, isFunctionReference, isNormalExpress
 export type { Argument, CommonReference, DatatypeReference, FunctionReference, Reference, ShorthandReference } from '../reference';
 export type { ApiName, FunctionName, ShorthandName, DatatypeName } from '../reference/api';
 export { isApiName, isDataType } from '../reference/api';
-export { findUnresolvedIdentifiersInFunction } from './analyze';

package/dist/cli/src/transformer/index.d.ts

@@ -0,0 +1,2 @@
+import type { TokenStream } from '../tokenizer/interface';
+export declare function transformTokens(tokenStram: TokenStream, transformer: (name: string) => string): TokenStream;

package/dist/cli/src/untokenizer/index.d.ts

@@ -0,0 +1,2 @@
+import type { TokenStream } from '../tokenizer/interface';
+export declare function untokenize(tokenStream: TokenStream): string;

package/dist/index.esm.js

@@ -2864,7 +2864,7 @@ var mathNormalExpression = {
     },
 };
 
-var version = "1.2.2-alpha.1";
+var version = "1.2.2-alpha.3";
 
 var uuidTemplate = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
 var xyRegexp = /[xy]/g;
@@ -6321,15 +6321,6 @@ function evaluateNumberAsFunction(fn, params, sourceCodeInfo) {
     return toAny(param[fn]);
 }
 
-// export function findUnresolvedIdentifiersInFunction(ast, contextStack, builtin: Builtin) => {
-//   const astNodes = Array.isArray(ast) ? ast : ast.b
-//   const unresolvedIdentifiers = new Set<UnresolvedIdentifier>()
-//   for (const subNode of astNodes) {
-//     findUnresolvedIdentifiersInAstNode(subNode, contextStack, builtin)
-//       .forEach(symbol => unresolvedIdentifiers.add(symbol))
-//   }
-//   return unresolvedIdentifiers
-// }
 var findUnresolvedIdentifiers = function (ast, contextStack, builtin) {
     var e_1, _a;
     var astNodes = Array.isArray(ast) ? ast : ast.b;
@@ -6938,26 +6929,6 @@ function analyze(ast, params) {
         outcomes: calculateOutcomes(createContextStack(params), ast.b),
     };
 }
-function findUnresolvedIdentifiersInFunction(fun, params) {
-    if (!isUserDefinedFunction(fun)) {
-        return new Set();
-    }
-    var result = new Set();
-    var contextStack = createContextStack(params);
-    fun.o.forEach(function (overload) {
-        var innerContextStack = contextStack.clone();
-        var newContext = overload.as.mandatoryArguments.reduce(function (acc, arg) {
-            acc[arg] = { value: null };
-            return acc;
-        }, {});
-        if (overload.as.restArgument) {
-            newContext[overload.as.restArgument] = { value: null };
-        }
-        var overloadSymbols = findUnresolvedIdentifiers(overload.b, innerContextStack.create(newContext), builtin);
-        overloadSymbols.forEach(function (symbol) { return result.add(symbol); });
-    });
-    return result;
-}
 
 function parseNumber(tokenStream, position) {
     var _a;
@@ -8080,6 +8051,12 @@ function assertNewLineToken(token) {
         throw new LitsError("Expected newline token, got ".concat(token === null || token === void 0 ? void 0 : token.t, "."));
 }
 
+function transformTokens(tokenStram, transformer) {
+    return __assign(__assign({}, tokenStram), { tokens: tokenStram.tokens.map(function (token) {
+            return __assign(__assign({}, token), { v: transformer(token.v) });
+        }) });
+}
+
 var UnparseOptions = /** @class */ (function () {
     function UnparseOptions(unparse, lineLength, col, inlined, locked) {
         if (col === void 0) { col = 0; }
@@ -8598,6 +8575,51 @@ function unparseAst(ast, lineLength) {
     return result.trim();
 }
 
+function isNoSpaceNeededBefore(token) {
+    switch (token.t) {
+        case TokenType.Bracket:
+            return [')', ']'].includes(token.v);
+        case TokenType.CollectionAccessor:
+            return true;
+        case TokenType.NewLine:
+            return true;
+        default:
+            return false;
+    }
+}
+function isNoSpaceNeededAfter(token) {
+    switch (token.t) {
+        case TokenType.Bracket:
+            return ['(', '['].includes(token.v);
+        case TokenType.CollectionAccessor:
+            return true;
+        case TokenType.FnShorthand:
+            return true;
+        case TokenType.NewLine:
+            return true;
+        case TokenType.RegexpShorthand:
+            return true;
+        default:
+            return false;
+    }
+}
+function untokenize(tokenStream) {
+    var lastToken;
+    return tokenStream.tokens.reduce(function (acc, token) {
+        var joiner = !lastToken || isNoSpaceNeededAfter(lastToken) || isNoSpaceNeededBefore(token) ? '' : ' ';
+        lastToken = token;
+        return "".concat(acc).concat(joiner).concat(untokenizeToken(token));
+    }, '');
+}
+function untokenizeToken(token) {
+    switch (token.t) {
+        case TokenType.String:
+            return "\"".concat(token.v, "\"");
+        default:
+            return token.v;
+    }
+}
+
 var Cache = /** @class */ (function () {
     function Cache(maxSize) {
         this.cache = {};
@@ -8729,6 +8751,12 @@ var Lits = /** @class */ (function () {
         var contextStack = createContextStack(params);
         return evaluate(ast, contextStack);
     };
+    Lits.prototype.transform = function (tokenStream, transformer) {
+        return transformTokens(tokenStream, transformer);
+    };
+    Lits.prototype.untokenize = function (tokenStream) {
+        return untokenize(tokenStream);
+    };
     Lits.prototype.apply = function (fn, fnParams, params) {
         var _a;
         if (params === void 0) { params = {}; }
@@ -15592,5 +15620,5 @@ function isDataType(arg) {
     return dataTypes.includes(arg);
 }
 
-export { AstNodeType, FunctionType, Lits, TokenType, apiReference, asLitsFunction, asNativeJsFunction, asUserDefinedFunction, assertLitsFunction, assertNativeJsFunction, assertUserDefinedFunction, createNativeJsFunction, findUnresolvedIdentifiersInFunction, isApiName, isBuiltinFunction, isDataType, isDatatypeReference, isFunctionReference, isLitsError, isLitsFunction, isNativeJsFunction, isNormalExpressionArgument, isShorthandReference, isSpecialExpressionArgument, isTypedValue, isUserDefinedFunction, normalExpressionKeys, reservedNames, specialExpressionKeys };
+export { AstNodeType, FunctionType, Lits, TokenType, apiReference, asLitsFunction, asNativeJsFunction, asUserDefinedFunction, assertLitsFunction, assertNativeJsFunction, assertUserDefinedFunction, createNativeJsFunction, isApiName, isBuiltinFunction, isDataType, isDatatypeReference, isFunctionReference, isLitsError, isLitsFunction, isNativeJsFunction, isNormalExpressionArgument, isShorthandReference, isSpecialExpressionArgument, isTypedValue, isUserDefinedFunction, normalExpressionKeys, reservedNames, specialExpressionKeys };
 //# sourceMappingURL=index.esm.js.map