cordo 2.11.0 → 2.12.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordo",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "description": "A framework for handling complex discord api interactions",
   "exports": {
     ".": "./src/index.ts",

package/src/core/routing/resolve.ts

@@ -1,4 +1,5 @@
 import { MissingContextError } from "../../errors/builtin/missing-context"
+import { FunctCompiler } from "../../functions/compiler"
 import { Hooks } from "../hooks"
 import type { CordoInteraction } from "../interaction"
 import { CordoMagic } from "../magic"
@@ -9,8 +10,10 @@ const DefaultFileName = 'index'
 export namespace RoutingResolve {
 
   function resolvePathDots(inputPath: string, startingPath: string) {
-    if (!inputPath.startsWith('.')) return inputPath
-    if (inputPath.startsWith('./')) return startingPath + inputPath.slice(1)
+    if (!inputPath.startsWith('.'))
+      return inputPath
+    if (inputPath.startsWith('./'))
+      return startingPath + inputPath.slice(1)
 
     const cwd = startingPath.split('/')
     if (cwd.at(-1) === DefaultFileName) cwd.pop()
@@ -63,8 +66,8 @@ export namespace RoutingResolve {
 
     if (!lockfile)
       throw new MissingContextError('getRouteFromPath failed, no lockfile found in context.')
-    if (!invoker)
-      throw new MissingContextError('getRouteFromPath failed, no invoker found in context.')
+    if (!invoker && resolveRuntimeVars)
+      throw new MissingContextError('getRouteFromPath failed, no invoker found in context with resolveRuntimeVars enabled.')
 
     let startingPoint = currentRoute
     if (startingPoint.endsWith(DefaultFileName))
@@ -75,7 +78,7 @@ export namespace RoutingResolve {
     const start = resolvePathDots(path, startingPoint)
     if (start === null) {
       console.log('Invalid route', path)
-      return { routeId: '####', args: [] }
+      return { routeId: FunctCompiler.InvalidRoutePlaceholderId, args: [] }
     }
 
     const segments = start.split('/').filter(Boolean)
@@ -118,7 +121,7 @@ export namespace RoutingResolve {
 
     if (options.length === 0) {
       console.log('Could not find route', path, '(', path, ')')
-      return { routeId: '####', args: [] }
+      return { routeId: FunctCompiler.InvalidRoutePlaceholderId, args: [] }
     }
 
     const maxSpecificity = Math.max(...options.map(o => o.specificity))
@@ -127,7 +130,7 @@ export namespace RoutingResolve {
     return {
       routeId: winner.route.name!,
       args: resolveRuntimeVars
-        ? substituteRuntimeVariables(winner.args, invoker)
+        ? substituteRuntimeVariables(winner.args, invoker!)
         : winner.args,
       routeFilePath: winner.route.filePath
     }

package/src/functions/compiler.ts

@@ -19,6 +19,8 @@ export namespace FunctCompiler {
   const LutArgumentIndicator = '\\'
   /** the following argument has the same value as an earlier argument */
   const ReferenceArgumentIndicator = '|'
+  /** placeholder route id for when the route could not be resolved */
+  export const InvalidRoutePlaceholderId = '#'.repeat(LockfileInternals.Const.idLength)
 
   //
 
@@ -39,9 +41,13 @@ export namespace FunctCompiler {
     const extraValues: string[] = []
 
     // encode cwd
-    const { routeId, args } = RoutingResolve.getRouteFromPath(CordoMagic.getCwd(), false)
-    command.push(routeId)
-    argus.push(...args)
+    if (CordoMagic.getCwd()) {
+      const { routeId, args } = RoutingResolve.getRouteFromPath(CordoMagic.getCwd(), false)
+      command.push(routeId)
+      argus.push(...args)
+    } else {
+      command.push(InvalidRoutePlaceholderId)
+    }
 
     // encode functs
     for (const fun of list) {
@@ -181,8 +187,6 @@ export namespace FunctCompiler {
     }
 
     const cwdRoute = readNextRoute()
-    if (!cwdRoute)
-      return out
 
     out.cwd = cwdRoute