@mojir/lits 1.2.2-alpha.5 → 2.2.2-alpha.6

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.5";
+var version = "2.2.2-alpha.6";
 
 var AstNodeType;
 (function (AstNodeType) {
@@ -7450,9 +7450,11 @@ function getSugar() {
     return [applyCollectionAccessors];
 }
 
+var identifierCharacterClass = '[\\w@%^?=!$<>+*/:-]';
+var identifierFirstCharacterClass = '[a-zA-Z_@%^?=!$<>+*/-]';
+
 var NO_MATCH = [0, undefined];
-var nameCharacterClass = '[\\w@%^?=!$<>+*/-]';
-var nameRegExp$1 = new RegExp(nameCharacterClass);
+var nameRegExp$1 = new RegExp(identifierCharacterClass);
 var whitespaceRegExp = /\s|,/;
 var newLineRegExp = /\n/;
 var tokenizeNewLine = function (input, current, debugData) {
@@ -16011,7 +16013,7 @@ function createFormatter(rules, options) {
     return format;
 }
 
-var variableRegExp$1 = new RegExp("^\\$".concat(nameCharacterClass, "+"));
+var variableRegExp$1 = new RegExp("^\\$".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*"));
 var noMatch = { count: 0, formattedText: '' };
 function createVariableRule(formatVariableName, variableNamePredicate) {
     return function (text, index) {
@@ -16034,11 +16036,11 @@ var getNumberRule = function (fmt) { return function (text, index) {
         var count = startMatch[0].length;
         var characterBefor = text[index - 1];
         var characterAfter = text[index + count];
-        if (characterBefor && new RegExp(nameCharacterClass).test(characterBefor))
+        if (characterBefor && new RegExp(identifierCharacterClass).test(characterBefor))
             return noMatch;
         if (characterBefor && numberRegExp.test(characterBefor))
             return noMatch;
-        if (characterAfter && new RegExp(nameCharacterClass).test(characterAfter))
+        if (characterAfter && new RegExp(identifierCharacterClass).test(characterAfter))
             return noMatch;
         if (characterAfter && numberRegExp.test(characterAfter))
             return noMatch;
@@ -16069,7 +16071,7 @@ var stringRule = createRule({
 });
 var shortcutStringRule = createRule({
     name: 'string',
-    startPattern: new RegExp("^:".concat(nameCharacterClass, "+")),
+    startPattern: new RegExp("^:".concat(identifierCharacterClass, "+")),
     startTag: ColorEnum.FgRed,
     endTag: ColorEnum.Reset,
     keepPatterns: true,
@@ -16078,7 +16080,7 @@ var shortcutStringRule = createRule({
 });
 var functionNameRule = createRule({
     name: 'functionName',
-    startPattern: new RegExp("^\\((?=".concat(nameCharacterClass, "+)")),
+    startPattern: new RegExp("^\\((?=".concat(identifierCharacterClass, "+)")),
     endPattern: /^[) \n]/,
     startTag: ColorEnum.FgBlue,
     endTag: ColorEnum.Reset,
@@ -16088,7 +16090,7 @@ var functionNameRule = createRule({
 });
 var nameRule = createRule({
     name: 'functionName',
-    startPattern: new RegExp("^".concat(nameCharacterClass, "+")),
+    startPattern: new RegExp("^".concat(identifierCharacterClass, "+")),
     startTag: "".concat(ColorEnum.Bright).concat(ColorEnum.FgBlue),
     endTag: ColorEnum.Reset,
     keepPatterns: true,
@@ -16229,7 +16231,7 @@ function createRule(_a) {
     };
 }
 
-var variableRegExp = new RegExp("\\$".concat(nameCharacterClass, "+"), 'g');
+var variableRegExp = new RegExp("\\$".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*"), 'g');
 function formatCliDescription(fmt, description, reference) {
     if (isFunctionReference(reference))
         return formatFunctionDescription(fmt, description, reference);
@@ -16372,9 +16374,9 @@ var historyResults = [];
 var lits = new Lits({ debug: true });
 var formatValue = getInlineCodeFormatter(fmt);
 var commands = ['`help', '`quit', '`builtins', '`context'];
-var expressionRegExp = new RegExp("^(.*\\(\\s*)(".concat(nameCharacterClass, "*)$"));
-var nameRegExp = new RegExp("^(.*?)(".concat(nameCharacterClass, "*)$"));
-var helpRegExp = new RegExp("^`help\\s+(".concat(nameCharacterClass, "+)\\s*$"));
+var expressionRegExp = new RegExp("^(.*\\(\\s*)(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*)$"));
+var nameRegExp = new RegExp("^(.*?)(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*)$"));
+var helpRegExp = new RegExp("^`help\\s+(".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "+)\\s*$"));
 var expressions = __spreadArray(__spreadArray([], __read(normalExpressionKeys), false), __read(specialExpressionKeys), false);
 var config = processArguments(process.argv.slice(2));
 if (config.eval) {

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

@@ -0,0 +1,8 @@
+export type Identifier = string & {
+    __brand: 'Identifier';
+};
+export declare const identifierCharacterClass = "[\\w@%^?=!$<>+*/:-]";
+export declare const identifierFirstCharacterClass = "[a-zA-Z_@%^?=!$<>+*/-]";
+export declare const identifierRegExp: RegExp;
+export declare function isIdentifier(value: string): value is Identifier;
+export declare function assertIdentifier(value: string): asserts value is Identifier;

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

@@ -14,4 +14,4 @@ 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 { nameCharacterClass } from './tokenizer/tokenizers';
+export { type Identifier, assertIdentifier, isIdentifier } from './identifier';

package/dist/cli/src/tokenizer/tokenizers.d.ts

@@ -1,5 +1,4 @@
 import type { Tokenizer } from './interface';
-export declare const nameCharacterClass = "[\\w@%^?=!$<>+*/-]";
 export declare const tokenizeNewLine: Tokenizer;
 export declare const tokenizeComment: Tokenizer;
 export declare const skipWhiteSpace: Tokenizer;

package/dist/index.esm.js

@@ -2864,7 +2864,7 @@ var mathNormalExpression = {
     },
 };
 
-var version = "1.2.2-alpha.5";
+var version = "2.2.2-alpha.6";
 
 var uuidTemplate = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
 var xyRegexp = /[xy]/g;
@@ -7482,9 +7482,21 @@ function getSugar() {
     return [applyCollectionAccessors];
 }
 
+var identifierCharacterClass = '[\\w@%^?=!$<>+*/:-]';
+var identifierFirstCharacterClass = '[a-zA-Z_@%^?=!$<>+*/-]';
+// eslint-disable-next-line regexp/use-ignore-case
+var identifierRegExp = new RegExp("^".concat(identifierFirstCharacterClass).concat(identifierCharacterClass, "*$"));
+function isIdentifier(value) {
+    return identifierRegExp.test(value);
+}
+function assertIdentifier(value) {
+    if (!isIdentifier(value)) {
+        throw new Error("Expected '".concat(value, "' to be an identifier"));
+    }
+}
+
 var NO_MATCH = [0, undefined];
-var nameCharacterClass = '[\\w@%^?=!$<>+*/-]';
-var nameRegExp = new RegExp(nameCharacterClass);
+var nameRegExp = new RegExp(identifierCharacterClass);
 var whitespaceRegExp = /\s|,/;
 var newLineRegExp = /\n/;
 var tokenizeNewLine = function (input, current, debugData) {
@@ -15620,5 +15632,5 @@ function isDataType(arg) {
     return dataTypes.includes(arg);
 }
 
-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, nameCharacterClass, normalExpressionKeys, reservedNames, specialExpressionKeys };
+export { AstNodeType, FunctionType, Lits, TokenType, apiReference, asLitsFunction, asNativeJsFunction, asUserDefinedFunction, assertIdentifier, assertLitsFunction, assertNativeJsFunction, assertUserDefinedFunction, createNativeJsFunction, isApiName, isBuiltinFunction, isDataType, isDatatypeReference, isFunctionReference, isIdentifier, isLitsError, isLitsFunction, isNativeJsFunction, isNormalExpressionArgument, isShorthandReference, isSpecialExpressionArgument, isTypedValue, isUserDefinedFunction, normalExpressionKeys, reservedNames, specialExpressionKeys };
 //# sourceMappingURL=index.esm.js.map