@gen3/toolsff 0.12.2 → 0.12.3

package/dist/buildColors.esm.js

@@ -113,42 +113,6 @@ const main = ()=>{
                 short: 't',
                 default: './colors.json'
             },
-            primary: {
-                type: 'string',
-                short: 'p',
-                default: '#532565'
-            },
-            secondary: {
-                type: 'string',
-                short: 's',
-                default: '#982568'
-            },
-            accent: {
-                type: 'string',
-                short: 'a',
-                default: '#E07C3E'
-            },
-            accentWarm: {
-                type: 'string',
-                default: '#E07C3E'
-            },
-            accentCool: {
-                type: 'string',
-                default: '#1552e0'
-            },
-            base: {
-                type: 'string',
-                short: 'b',
-                default: '#858585'
-            },
-            table: {
-                type: 'string',
-                default: '#858585'
-            },
-            navigation: {
-                type: 'string',
-                default: '#eaeaea'
-            },
             out: {
                 type: 'string',
                 short: 'o',

package/dist/scanSitePaths.esm.js

@@ -0,0 +1,174 @@
+#!/usr/bin/env node
+import fs from 'fs';
+import path from 'path';
+import nextEnv from '@next/env';
+import { parseArgs } from 'node:util';
+
+const { loadEnvConfig } = nextEnv;
+// Load .env files before reading process.env.*
+loadEnvConfig(process.cwd());
+const GEN3_COMMONS_NAME = process.env.NEXT_PUBLIC_GEN3_COMMONS_NAME || 'gen3';
+const PAGE_EXT_RE = /\.(tsx|ts|jsx|js)$/;
+const DEFAULT_EXCLUDED_ROUTES = [
+    '/403',
+    '/404',
+    '/Login',
+    '/*',
+    '/api',
+    '/no-workspace-access'
+];
+function toPosixPath(p) {
+    return p.split(path.sep).join('/');
+}
+function loadAuthConfig() {
+    const authConfigFile = path.join(process.cwd(), `config/${GEN3_COMMONS_NAME}`, 'authz.json');
+    const defaultAuthzConfigFile = path.join(process.cwd(), `config`, 'authz_default.json');
+    if (fs.existsSync(authConfigFile)) {
+        console.log(`Loading authz config from ${authConfigFile}`);
+        return JSON.parse(fs.readFileSync(authConfigFile).toString('utf8'));
+    }
+    if (fs.existsSync(defaultAuthzConfigFile)) {
+        console.log(`Loading authz config from ${defaultAuthzConfigFile}`);
+        return JSON.parse(fs.readFileSync(defaultAuthzConfigFile).toString('utf8'));
+    }
+    console.log(`No authz config found. Using default authz rules.`);
+    return {
+        '/Profile': {
+            loginRequired: true
+        },
+        '*': {
+            loginRequired: false
+        }
+    };
+}
+function normalizeRoute(route) {
+    let r = route.startsWith('/') ? route : `/${route}`;
+    r = r.replace(/\/{2,}/g, '/');
+    if (r.length > 1) r = r.replace(/\/$/, '');
+    return r;
+}
+// ✅ Convert Next.js pages-style dynamic segments to middleware matcher syntax
+function routeToMiddlewareMatcher(route) {
+    // route examples:
+    // "/Explorer/[configId]"  -> "/Explorer/:configId"
+    // "/notebook/[...notebook]" -> "/notebook/:notebook*"
+    // "/foo/[[...slug]]" -> "/foo/:slug*"
+    return route.replace(/\[\[\.\.\.(\w+)\]\]/g, ':$1*') // optional catch-all
+    .replace(/\[\.\.\.(\w+)\]/g, ':$1*') // catch-all
+    .replace(/\[(\w+)\]/g, ':$1'); // single segment
+}
+function filePathToRoute(relativeFilePosix) {
+    if (!PAGE_EXT_RE.test(relativeFilePosix)) return null;
+    if (relativeFilePosix === 'api' || relativeFilePosix.startsWith('api/')) return null;
+    const baseName = path.posix.basename(relativeFilePosix);
+    if (baseName.startsWith('_')) return null;
+    let noExt = relativeFilePosix.replace(PAGE_EXT_RE, '');
+    noExt = noExt.replace(/\/index$/i, '');
+    if (noExt === 'index') noExt = '';
+    return normalizeRoute(noExt);
+}
+function scanPagesRoutes(pagesDirAbs, pagesRootAbs) {
+    const routes = [];
+    if (!fs.existsSync(pagesDirAbs)) return routes;
+    const entries = fs.readdirSync(pagesDirAbs, {
+        withFileTypes: true
+    });
+    for (const entry of entries){
+        const fullPath = path.join(pagesDirAbs, entry.name);
+        if (entry.isDirectory()) {
+            if (entry.name === '.next') continue;
+            routes.push(...scanPagesRoutes(fullPath, pagesRootAbs));
+            continue;
+        }
+        if (!entry.isFile()) continue;
+        const relFromPages = path.relative(pagesRootAbs, fullPath);
+        const relPosix = toPosixPath(relFromPages);
+        const route = filePathToRoute(relPosix);
+        if (route) routes.push(route);
+    }
+    return routes;
+}
+function getPagesRoutes(opts = {}) {
+    const pagesDir = path.resolve(opts.pagesDir || './src/pages');
+    const excluded = new Set((opts.excludeRoutes || DEFAULT_EXCLUDED_ROUTES).map(normalizeRoute));
+    const routes = scanPagesRoutes(pagesDir, pagesDir).map(normalizeRoute).filter((r)=>{
+        if (excluded.has(r)) return false;
+        if (r === '/') return false;
+        return true;
+    });
+    return Array.from(new Set(routes)).sort((a, b)=>a.localeCompare(b));
+}
+function getMatcherFromAuthConfig(authConfig) {
+    const paths = Object.keys(authConfig?.routes ?? {});
+    const normalizedRoutes = paths.map((p)=>normalizeRoute(p));
+    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
+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}`);
+    fs.mkdirSync(path.dirname(outputFile), {
+        recursive: true
+    });
+    fs.writeFileSync(outputFile, body);
+}
+/**
+ * Configures and generates middleware 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
+ * 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
+ *                                            are scanned and included; otherwise, specific routes from the
+ *                                            authentication configuration are considered.
+ */ const createMiddlewareRoutes = (useScanAllPaths = false)=>{
+    const authConfig = loadAuthConfig();
+    const allPagesRequireLogin = authConfig?.routes?.['*']?.loginRequired;
+    let routes;
+    if (allPagesRequireLogin) {
+        console.log('All pages require login. Adding all routes to middleware 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.');
+        routes = getMatcherFromAuthConfig(authConfig);
+    }
+    // ✅ Convert to valid middleware 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')}`);
+    writeGeneratedMiddlewareEntryTs(matcher);
+};
+function main() {
+    try {
+        const { values: { scanAllPages } } = parseArgs({
+            options: {
+                scanAllPages: {
+                    type: 'boolean',
+                    default: false
+                }
+            }
+        });
+        createMiddlewareRoutes(scanAllPages);
+    } catch (e) {
+        if (e instanceof Error) {
+            if (e.name === 'ERR_PARSE_ARGS_UNKNOWN_OPTION') {
+                console.error(`Error: ${e.message}`);
+            // Optionally print usage or help here
+            } else if (e.name === 'ERR_PARSE_ARGS_INVALID_OPTION_VALUE') {
+                console.error(`Error: Missing value for option.`);
+            } else {
+                console.error('An unexpected error occurred:', e.message);
+            }
+        } else console.error('An unknown error occurred');
+        process.exit(1);
+    }
+}
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gen3/toolsff",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "tools for processing Gen3 commons content: color theme, icons, sharedFilters",
   "main": "index.js",
   "type": "module",
@@ -22,7 +22,7 @@
     "getSharedMapping": "./dist/getSharedMapping.esm.js",
     "getDRSToHostname": "./dist/getDRSToHostname.esm.js",
     "getSharedFilters": "./dist/getSharedFilters.esm.js",
-    "gdcGqlToGuppyGql": "./dist/gdcGqlToGuppyGql.esm.js"
+    "scanSitePaths": "./dist/scanSitePaths.esm.js"
   },
   "author": "Craig Barnes",
   "license": "Apache-2.0",
@@ -47,6 +47,5 @@
       "undici": "^6.21.1",
       "axios": "^1.8.2"
     }
-  },
-  "gitHead": "d6a8d9fa8fb76a6d9c8eb52bb71704775b1ebc57"
+  }
 }

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();