@witchcraft/expressit 0.2.1 → 0.3.0

package/src/utils/getOppositeDelimiter.ts

@@ -6,7 +6,7 @@ import { isDelimiter } from "./isDelimiter.js"
 import { isParen } from "./isParen.js"
 import { isQuote } from "./isQuote.js"
 
-import { type AnyToken, type ArrayNode, type ConditionNode,type GroupNode, TOKEN_TYPE, type TokenDelimiterTypes, type VariableNode } from "../types/ast.js"
+import { type AnyToken, type ArrayNode, type ConditionNode,type GroupNode, TOKEN_TYPE, type TokenDelimiter, type VariableNode } from "../types/ast.js"
 
 /**
  * Given a delimiter token, returns it's opposite pair, or undefined if the type passed was not a delimiter token (so you can pass any type without checking).
@@ -14,7 +14,7 @@ import { type AnyToken, type ArrayNode, type ConditionNode,type GroupNode, TOKEN
 export function getOppositeDelimiter(
 	token: AnyToken,
 	parentsMap: ReturnType<typeof generateParentsMap>
-): AnyToken<TokenDelimiterTypes> | undefined {
+): AnyToken<TokenDelimiter> | undefined {
 	const parent = parentsMap.get(token)
 	if (!isDelimiter(token)) throw new Error("Token is not a delimiter type.")
 	if (isParen(token)) {

package/src/utils/getSurroundingErrors.ts

@@ -43,10 +43,10 @@ export function getSurroundingErrors(tokens: AnyToken[], token: CursorInfo): Err
 	}
 
 	return errors.sort((a, b) => {
-		const aIsQuote = [TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.BACKTICK, TOKEN_TYPE.SINGLEQUOTE].includes(a.expected[0])
-		const bIsQuote = [TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.BACKTICK, TOKEN_TYPE.SINGLEQUOTE].includes(b.expected[0])
-		const aIsParen = [TOKEN_TYPE.PARENR, TOKEN_TYPE.PARENL].includes(a.expected[0])
-		const bIsParen = [TOKEN_TYPE.PARENR, TOKEN_TYPE.PARENL].includes(b.expected[0])
+		const aIsQuote = ([TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.BACKTICK, TOKEN_TYPE.SINGLEQUOTE] as string[]).includes(a.expected[0])
+		const bIsQuote = ([TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.BACKTICK, TOKEN_TYPE.SINGLEQUOTE]as string[]).includes(b.expected[0])
+		const aIsParen = ([TOKEN_TYPE.PARENR, TOKEN_TYPE.PARENL] as string[]).includes(a.expected[0])
+		const bIsParen = ([TOKEN_TYPE.PARENR, TOKEN_TYPE.PARENL] as string[]).includes(b.expected[0])
 		const aCloseness = Math.abs(i - tokens.indexOf(a))
 		const bCloseness = Math.abs(i - tokens.indexOf(b))
 		const closenessComparison = aCloseness - bCloseness

package/src/utils/isDelimiter.ts

@@ -1,9 +1,9 @@
-import { type AnyToken, TOKEN_TYPE, type TokenDelimiterTypes } from "../types/ast.js"
+import { type AnyToken, TOKEN_TYPE, type TokenDelimiter } from "../types/ast.js"
 
 /**
  * Returns whether token is a delimiter type (including if it's an expanded operator separator).
  */
-export function isDelimiter(token?: AnyToken): token is AnyToken<TokenDelimiterTypes> {
+export function isDelimiter(token?: AnyToken): token is AnyToken<TokenDelimiter> {
 	return ([
 		TOKEN_TYPE.BACKTICK,
 		TOKEN_TYPE.DOUBLEQUOTE,
@@ -14,5 +14,5 @@ export function isDelimiter(token?: AnyToken): token is AnyToken<TokenDelimiterT
 		TOKEN_TYPE.BRACKETR,
 		TOKEN_TYPE.OP_EXPANDED_SEP,
 		TOKEN_TYPE.REGEX,
-	] as TokenDelimiterTypes[]).includes(token?.type as TokenDelimiterTypes)
+	] as TokenDelimiter[]).includes(token?.type as TokenDelimiter)
 }

package/src/utils/isParen.ts

@@ -1,6 +1,6 @@
-import { type AnyToken, TOKEN_TYPE, type TokenParenTypes } from "../types/ast.js"
+import { type AnyToken, TOKEN_TYPE, type TokenParen } from "../types/ast.js"
 
 
-export function isParen(token?: AnyToken): token is AnyToken<TokenParenTypes> {
+export function isParen(token?: AnyToken): token is AnyToken<TokenParen> {
 	return ([TOKEN_TYPE.PARENL, TOKEN_TYPE.PARENR] as any[]).includes(token?.type)
 }

package/src/utils/isQuote.ts

@@ -1,6 +1,6 @@
-import { type AnyToken, TOKEN_TYPE, type TokenQuoteTypes } from "../types/ast.js"
+import { type AnyToken, TOKEN_TYPE, type TokenQuote } from "../types/ast.js"
 
 /** Returns if the token is a quote token. This includes regex delimiters. */
-export function isQuote(token?: AnyToken): token is AnyToken<TokenQuoteTypes> {
+export function isQuote(token?: AnyToken): token is AnyToken<TokenQuote> {
 	return ([TOKEN_TYPE.BACKTICK, TOKEN_TYPE.DOUBLEQUOTE, TOKEN_TYPE.SINGLEQUOTE, TOKEN_TYPE.REGEX] as any[]).includes(token?.type)
 }

package/dist/examples/shortcutContextParser.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"shortcutContextParser.d.ts","sourceRoot":"","sources":["../../src/examples/shortcutContextParser.ts"],"names":[],"mappings":"AACA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAI/C,qBAAa,qBAAqB,CAAC,CAAC,SACnC,QAAQ,GAAG;IAAE,IAAI,EAAE,CAAC,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,oBAAoB,CAAC,CAAA;CAAE,GAClG,QAAQ,GAAG;IAAE,IAAI,EAAE,CAAC,YAAY,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,oBAAoB,CAAC,CAAA;CAAE,CACjG,SAAQ,MAAM,CAAC,CAAC,CAAC;IAClB,SAAS,EAAE,MAAM,EAAE,CAAK;IAExB,aAAa,EAAE,MAAM,EAAE,CAAK;gBAG3B,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,eAAe,GAAE,MAAM,EAAoB;IAmG5C,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAK9C,OAAO,CAAC,uBAAuB;CAa/B"}

package/dist/global.d.js

@@ -1 +0,0 @@
-

package/dist/package.js

@@ -1,7 +0,0 @@
-import pkg from "./package.json.js";
-const version = pkg.version;
-const repository = pkg.repository;
-export {
-  repository,
-  version
-};

package/src/global.d.ts

@@ -1,4 +0,0 @@
-declare module "./package.js" {
-	export const version: string
-	export const repository: string
-}

package/src/package.js

@@ -1,11 +0,0 @@
-import pkg from "../package.json"
-
-/**
- * This library imports it's own package.json for inserting the version number into errors. Doing this is not a problem normally (because babel is used to transpile the typescript instead of tsc), but when tsc is used to output the types, the output is nested (dist-types/src/*) because of the json import being outside the src dir. There is a way around this but it's complicated. The easier way is to just cheat and do the importing in this js file. Typescript consumes it none the wiser and babel transpiles it to cjs/es accordingly.
- *
- * The values could be inlined, but there are no battle tested actively maintained babel plugins for this, and problems would be hard to debug (given when developing, the package.json never contains the real version because the library is semantically released.)
- */
-
-
-export const version = pkg.version
-export const repository = pkg.repository