@vyckr/tachyon 0.1.0 → 0.2.0

package/Dockerfile

@@ -16,28 +16,32 @@ RUN unzip bun-lambda-layer.zip -d /tmp
 
 WORKDIR /tmp
 
-COPY ./src/Tach.ts .
-
 COPY package.json .
 
 RUN bun install
 
-RUN bun build --target=bun Tach.ts --outfile lambda
-
 FROM public.ecr.aws/lambda/provided:al2
 
-COPY --from=build /tmp/lambda ${LAMBDA_TASK_ROOT}
+COPY --from=build /tmp/node_modules ${LAMBDA_TASK_ROOT}/node_modules
+
+COPY --from=build /tmp/package.json ${LAMBDA_TASK_ROOT}/package.json
 
 COPY --from=build /tmp/bootstrap ${LAMBDA_RUNTIME_DIR}
 
 COPY --from=build /tmp/bun /opt
 
+COPY ./src/Tach.ts ${LAMBDA_TASK_ROOT}
+
+COPY ./tsconfig.json ${LAMBDA_TASK_ROOT}
+
 COPY ./src/runtime.ts /opt
 
 RUN chmod 777 /opt/bun
 
-RUN chmod 777 ${LAMBDA_TASK_ROOT}/lambda
+RUN chmod 777 /opt/runtime.ts
+
+RUN chmod 777 ${LAMBDA_TASK_ROOT}/Tach.ts
 
 RUN chmod 777 ${LAMBDA_RUNTIME_DIR}/bootstrap
 
-CMD ["lambda.fetch"]
+CMD ["Tach.fetch"]

package/README.md

@@ -60,12 +60,12 @@ Make sure you have set the 'SCHEMA_PATH' if 'SCHEMA' is set to 'STRICT'. The sch
 ### Requirements
 - Make sure to have a 'routes' directory in the root of your project
 - Dynamic routes should be enclosed in square brackets
-- The first parameter should NOT be a dynamic route (e.g. /[version]/doc.ts)
-- All dynamic routes should be within odd indexes (e.g. /v1/[path]/login/[id]/name.ts)
-- The last parameter in the route should not be a dynamic route (e.g. /v1/[path]/login/[id]/name.ts)
+- The first parameter should NOT be a dynamic route (e.g. /[version]/doc/index.ts)
+- All dynamic routes should be within odd indexes (e.g. /v1/[path]/login/[id]/name/index.ts)
+- The last parameter in the route should not be a dynamic route (e.g. /v1/[path]/login/[id]/name/index.ts)
 
 ```typescript
-// routes/v1/[collection]/doc.ts
+// routes/v1/[collection]/doc/index.ts
 import Silo from "@vyckr/byos"
 imoprt { VALIDATE } from "../utils/decorators"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vyckr/tachyon",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "devDependencies": {
     "@types/node": "^20.4.2",
     "bun-types": "^1.1.21"

package/routes/byos/[primary]/{doc.ts → doc/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../_utils/validation.js";
+import { VALIDATE } from "../../../utils/validation.js";
 
 export default class Doc {
 

package/routes/byos/[primary]/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../_utils/validation.js";
+import { VALIDATE } from "../../../utils/validation.js";
 
 export default class Docs {
 

package/routes/byos/[primary]/join/[secondary]/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../../_utils/validation.js";
+import { VALIDATE } from "../../../../../utils/validation.js";
 
 export default class Docs {
 

package/routes/byos/[primary]/stream/{doc.ts → doc/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../_utils/validation.js";
+import { VALIDATE } from "../../../../utils/validation.js";
 
 export default class {
 

package/routes/byos/[primary]/stream/{docs.ts → docs/index.ts}

@@ -1,4 +1,4 @@
-import { VALIDATE } from "../../../_utils/validation.js";
+import { VALIDATE } from "../../../../utils/validation.js";
 
 export default class {
 

package/src/Tach.ts

@@ -39,7 +39,7 @@ const Tach = {
 
     routesPath: process.env.LAMBDA_TASK_ROOT ? `${process.env.LAMBDA_TASK_ROOT}/routes` : `${process.cwd()}/routes`,
 
-    hasMiddleware: await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/_middleware.ts`) || await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/_middleware.js`) ,
+    hasMiddleware: await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/middleware.ts`) || await exists(`${process.env.LAMBDA_TASK_ROOT || process.cwd()}/routes/middleware.js`) ,
 
     pathsMatch(routeSegs: string[], pathSegs: string[]) {
 
@@ -47,10 +47,10 @@ const Tach = {
             return false;
         }
 
-        const slugs = Tach.routeSlugs.get(`${routeSegs.join('/')}.ts`) || Tach.routeSlugs.get(`${routeSegs.join('/')}.js`) || new Map<string, number>()
+        const slugs = Tach.routeSlugs.get(`${routeSegs.join('/')}/index.ts`) || Tach.routeSlugs.get(`${routeSegs.join('/')}/index.js`) || new Map<string, number>()
     
         for (let i = 0; i < routeSegs.length; i++) {
-            if (!slugs.has(routeSegs[i]) && routeSegs[i].replace('.ts', '').replace('.js', '') !== pathSegs[i]) {
+            if (!slugs.has(routeSegs[i]) && routeSegs[i] !== pathSegs[i]) {
                 return false;
             }
         }
@@ -73,7 +73,11 @@ const Tach = {
         let bestMatchLength = -1;
 
         for (const [routeKey] of Tach.indexedRoutes) {
-            const routeSegs = routeKey.split('/').map(seg => seg.replace('.ts', '').replace('.js', ''));
+
+            const routeSegs = routeKey.split('/')
+
+            routeSegs.pop()
+            
             const isMatch = Tach.pathsMatch(routeSegs, paths.slice(0, routeSegs.length));
 
             if (isMatch && routeSegs.length > bestMatchLength) {
@@ -230,7 +234,7 @@ const Tach = {
 
         if(searchParams.size > 0) queryParams = Tach.parseKVParams(searchParams)
 
-        const middlewarePath = await exists(`${Tach.routesPath}/_middleware.ts`) ? `${Tach.routesPath}/_middleware.ts` : `${Tach.routesPath}/_middleware.js`
+        const middlewarePath = await exists(`${Tach.routesPath}/middleware.ts`) ? `${Tach.routesPath}/middleware.ts` : `${Tach.routesPath}/middleware.js`
 
         if(params.length > 0 && !queryParams && !data) {
 
@@ -480,19 +484,17 @@ const Tach = {
 
             const slugs = new Map<string, number>()
 
+            if(pattern.test(paths[0]) || pattern.test(paths[paths.length - 1])) throw new Error(`Invalid route ${route}`)
+
             paths.forEach((path, idx) => {
 
-                if(pattern.test(path) && (idx % 2 === 0 || paths[idx].includes('.ts') || paths[idx].includes('.js'))) {
+                if(pattern.test(path) && (pattern.test(paths[idx - 1]) || pattern.test(paths[idx + 1]))) {
                     throw new Error(`Invalid route ${route}`)
                 }
 
                 if(pattern.test(path)) slugs.set(path, idx)
             })
     
-            const idx = paths.findIndex((path) => pattern.test(path))
-    
-            if(idx > -1 && (idx % 2 === 0 || paths[idx].includes('.ts') || paths[idx].includes('.js'))) throw new Error(`Invalid route ${route}`)
-    
             const staticPath = paths.filter((path) => !pattern.test(path)).join(',')
     
             if(staticPaths.includes(staticPath)) throw new Error(`Duplicate route ${route}`)
@@ -520,10 +522,8 @@ const Tach = {
 
         if(route) return await validateRoute(route)
 
-        const files = Array.from(new Glob(`**/*.{ts,js}`).scanSync({ cwd: Tach.routesPath }))
-
-        const routes = files.filter((route) => !route.split('/').some((path) => path.startsWith('_')))
-
+        const routes = Array.from(new Glob(`**/*/index.{ts,js}`).scanSync({ cwd: Tach.routesPath }))
+        
         for(const route of routes) await validateRoute(route)
     },