@gen3/toolsff 0.12.41 → 0.12.43

package/dist/scanSitePaths.esm.js

@@ -37,7 +37,7 @@ function normalizeRoute(route) {
     if (r.length > 1) r = r.replace(/\/$/, '');
     return r;
 }
-// ✅ Convert Next.js pages-style dynamic segments to middleware matcher syntax
+// ✅ Convert Next.js pages-style dynamic segments to proxy matcher syntax
 function routeToMiddlewareMatcher(route) {
     // route examples:
     // "/Explorer/[configId]"  -> "/Explorer/:configId"
@@ -94,47 +94,47 @@ function getMatcherFromAuthConfig(authConfig) {
     const excluded = new Set(DEFAULT_EXCLUDED_ROUTES.map(normalizeRoute));
     return normalizedRoutes.filter((r)=>!excluded.has(r));
 }
-// ✅ Generates the actual Next middleware entry file with literal matcher
+// ✅ Generates the actual Next proxy entry file with literal matcher
 function writeGeneratedMiddlewareEntryTs(matcher, opts = {}) {
-    const outputFile = path.resolve(opts.outputFile || './src/middleware.ts');
-    const body = `// @generated by tools/scanSitePaths.ts\n` + `// Do not edit manually. Edit src/middleware-impl.ts instead.\n` + `export { middleware } from './middleware-impl';\n\n` + `export const config = {\n` + `  matcher: ${JSON.stringify(matcher, null, 2)},\n` + `};\n`;
-    console.log(`Writing generated middleware entry to ${outputFile}`);
+    const outputFile = path.resolve(opts.outputFile || './src/proxy.ts');
+    const body = `// @generated by tools/scanSitePaths.ts\n` + `// Do not edit manually. Edit src/proxy-impl.ts instead.\n` + `export { proxy } from './proxy-impl';\n\n` + `export const config = {\n` + `  matcher: ${JSON.stringify(matcher, null, 2)},\n` + `};\n`;
+    console.log(`Writing generated proxy entry to ${outputFile}`);
     fs.mkdirSync(path.dirname(outputFile), {
         recursive: true
     });
     fs.writeFileSync(outputFile, body);
 }
 /**
- * Configures and generates middleware route matchers based on authentication and routing requirements.
+ * Configures and generates proxy route matchers based on authentication and routing requirements.
  *
- * The function determines the set of middleware routes based on the authentication configuration and
- * whether all pages require login. It generates appropriate route matchers for middleware processing
+ * The function determines the set of proxy routes based on the authentication configuration and
+ * whether all pages require login. It generates appropriate route matchers for proxy processing
  * and writes the resulting matchers to a TypeScript file for use in the application.
  *
  * @param {boolean} [useScanAllPaths=false] - A flag to determine whether to include all application routes
- *                                            in the middleware path matcher. If true, all application routes
+ *                                            in the proxy path matcher. If true, all application routes
  *                                            are scanned and included; otherwise, specific routes from the
  *                                            authentication configuration are considered.
- * @param forceMatchAll - set to true to force all routes to be matched by the middleware.
+ * @param forceMatchAll - set to true to force all routes to be matched by the proxy.
  */ const createMiddlewareRoutes = (useScanAllPaths = false, forceMatchAll = false)=>{
     const authConfig = loadAuthConfig();
     const allPagesRequireLogin = authConfig?.routes?.['*']?.loginRequired;
     let routes;
     if (allPagesRequireLogin || forceMatchAll) {
-        console.log('All pages require login. Adding all routes to middleware path matcher.');
+        console.log('All pages require login. Adding all routes to proxy path matcher.');
         routes = useScanAllPaths ? getPagesRoutes() : []; // setting to [] will cause the matcher to be set below
     } else {
-        console.log('Some pages require login. Adding authz routes to middleware  path matcher.');
+        console.log('Some pages require login. Adding authz routes to proxy  path matcher.');
         routes = getMatcherFromAuthConfig(authConfig);
     }
-    // ✅ Convert to valid middleware matcher patterns
+    // ✅ Convert to valid proxy matcher patterns
     let matcher = (routes || []).map(routeToMiddlewareMatcher);
     if (matcher.length === 0) {
         matcher = [
             '/((?!_next/static|_next/image|_next/data|Login|api|403|404|no-workspace-access|favicon.ico|.*\\.ico$|.*\\.png$|.*\\.jpg$|.*\\.svg$|.*\\.json$).*)'
         ];
     }
-    console.log(`middleware matcher entries:\n${matcher.join('\n')}`);
+    console.log(`proxy matcher entries:\n${matcher.join('\n')}`);
     writeGeneratedMiddlewareEntryTs(matcher);
 };
 function main() {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@gen3/toolsff",
-  "version": "0.12.41",
+  "version": "0.12.43",
   "description": "tools for processing Gen3 commons content: color theme, icons, sharedFilters",
   "main": "index.js",
   "type": "module",
   "engines": {
     "npm": ">=11.9.0",
-    "node": ">=24.14.0"
+    "node": ">=24.15.0"
   },
   "scripts": {
     "lint": "eslint --ext .js,.ts src",
@@ -48,5 +48,5 @@
       "axios": "^1.8.2"
     }
   },
-  "gitHead": "960fb78d55a692d81c9e7ebeb0e248e4f98f8fbf"
+  "gitHead": "8948283d154e2a56a7dbc0b4218cc187c293485e"
 }

package/dist/gdcGqlToGuppyGql.esm.js

@@ -1,148 +0,0 @@
-const getArgs = (defaults)=>{
-    const args = {
-        ...defaults
-    };
-    process.argv.slice(2, process.argv.length).forEach((arg)=>{
-        // long arg
-        if (arg.slice(0, 2) === '--') {
-            const longArg = arg.split('=');
-            const longArgFlag = longArg[0].slice(2, longArg[0].length);
-            const longArgValue = longArg.length > 1 ? longArg[1] : true;
-            args[longArgFlag] = longArgValue;
-        } else if (arg[0] === '-') {
-            const flags = arg.slice(1, arg.length).split('');
-            flags.forEach((flag)=>{
-                args[flag] = true;
-            });
-        }
-    });
-    return args;
-};
-
-const assertNever = (x)=>{
-    throw Error(`Exhaustive comparison did not handle: ${x}`);
-};
-const handleGqlOperation = (handler, op)=>{
-    switch(op.op){
-        case '=':
-            return handler.handleEquals(op);
-        case '!=':
-            return handler.handleNotEquals(op);
-        case '<':
-            return handler.handleLessThan(op);
-        case '<=':
-            return handler.handleLessThanOrEquals(op);
-        case '>':
-            return handler.handleGreaterThan(op);
-        case '>=':
-            return handler.handleGreaterThanOrEquals(op);
-        // case "is":
-        //   return handler.handleMissing(op);
-        // case "not":
-        //   return handler.handleExists(op);
-        case 'in':
-            return handler.handleIncludes(op);
-        case 'exclude':
-            return handler.handleExcludes(op);
-        case 'excludeifany':
-            return handler.handleExcludeIfAny(op);
-        case 'and':
-            return handler.handleIntersection(op);
-        case 'or':
-            return handler.handleUnion(op);
-        default:
-            return assertNever(op);
-    }
-};
-
-// a handler to convert from gql to guppy gql
-class FromGDCToGen3 {
-    constructor(){
-        this.handleEquals = (op)=>({
-                "=": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleNotEquals = (op)=>({
-                "!=": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleLessThan = (op)=>({
-                "<": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleLessThanOrEquals = (op)=>({
-                "<=": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleGreaterThan = (op)=>({
-                ">": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleGreaterThanOrEquals = (op)=>({
-                ">=": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        // handleMissing = (op: GqlMissing): Missing => ({
-        //   operator: "missing",
-        //   field: op.content.field,
-        // });
-        // handleExists = (op: GqlExists): Exists => ({
-        //   operator: "exists",
-        //   field: op.content.field,
-        // });
-        this.handleIncludes = (op)=>({
-                "in": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleExcludes = (op)=>({
-                "exclude": {
-                    [op.content.field]: op.content.value
-                }
-            });
-        this.handleExcludeIfAny = (op)=>({
-                "excludeifany": {
-                    [op.content.field]: op.content.value instanceof Array ? op.content.value : [
-                        op.content.value
-                    ]
-                }
-            });
-        this.handleIntersection = (op)=>({
-                and: op.content.map(convertGDCFilterToGen3Filter)
-            });
-        this.handleUnion = (op)=>({
-                or: op.content.map(convertGDCFilterToGen3Filter)
-            });
-    }
-}
-const convertGDCFilterToGen3Filter = (gqlFilter)=>{
-    const handler = new FromGDCToGen3();
-    return handleGqlOperation(handler, gqlFilter);
-};
-
-const main = async ()=>{
-    console.log('Starting');
-    try {
-        const { query } = getArgs({
-            query: ''
-        });
-        if (!query) {
-            console.log('No query provided');
-            return;
-        }
-        console.log('query', query);
-        const gdcQuery = JSON.parse(query);
-        console.log(gdcQuery);
-        const gen3Query = convertGDCFilterToGen3Filter(gdcQuery);
-        console.log(gen3Query);
-    } catch (e) {
-        console.log('Invalid query');
-    }
-};
-main();