@entur/function-tools 0.0.1 → 0.0.3

package/README.md

@@ -1,2 +1,2 @@
-# firebase-tools
-Ekstra verktøy for firebase
+# function-tools
+Ekstra verktøy for firebase functions

package/bin/enturFunctions.js

@@ -5,7 +5,7 @@ import { registerStart } from '../lib/commands/start.js';
 import { registerUnusedExports } from '../lib/commands/unusedExports.js';
 
 const program = new Command();
-program.name("entur-firebase").description("A multi-command CLI built with commander").version("0.0.1").option("-v, --verbose", "Enable verbose output");
+program.name("entur-firebase").description("A multi-command CLI built with commander").version("0.0.3").option("-v, --verbose", "Enable verbose output");
 registerBuild(program);
 registerDeploy(program);
 registerStart(program);

package/lib/commands/build.js

@@ -3,12 +3,12 @@ import { flattenDependencies, harmonizeDependencies, calculateDependencies } fro
 import { cleanDir } from '../utils/fs.js';
 import { readPackageJSON } from '../utils/packageJSON.js';
 import { getWorkspacePackageNames } from '../utils/workspace.js';
-import { createContext } from './utils.js';
+import { resolveProjectConfig } from './utils.js';
 
 function registerBuild(program) {
     program.command("build").description("Build the project").option("-o, --output-dir <dir>", "Output directory").action(async (options)=>{
         try {
-            const { packageRoot, packageJSON, outputDir, pnpmWorkspaceYAML } = await createContext(options);
+            const { packageRoot, packageJSON, outputDir, pnpmWorkspaceYAML } = await resolveProjectConfig(options);
             const { name, exports: exports$1 } = await readPackageJSON(packageJSON);
             console.log("🧹 Cleaning dist folder");
             await cleanDir(outputDir);

package/lib/commands/deploy.js

@@ -6,13 +6,13 @@ import { getFirebaseJSON, writeFirebaseJSON } from '../utils/firebase.js';
 import { cleanDir, writeJSON } from '../utils/fs.js';
 import { readPackageJSON, getPackageName, writePackageJSON } from '../utils/packageJSON.js';
 import { getWorkspacePackageNames } from '../utils/workspace.js';
-import { createContext } from './utils.js';
+import { resolveProjectConfig } from './utils.js';
 
 function registerDeploy(program) {
     program.command("deploy").description("Deploy the project").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").action(async (options)=>{
         try {
-            const context = await createContext(options);
-            await deploy(context);
+            const projectConfig = await resolveProjectConfig(options);
+            await deploy(projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);

package/lib/commands/start.js

@@ -5,13 +5,13 @@ import { getFirebaseJSON, writeFirebaseJSON } from '../utils/firebase.js';
 import { cleanDir, writeJSON } from '../utils/fs.js';
 import { readPackageJSON, getPackageName, writePackageJSON } from '../utils/packageJSON.js';
 import { getWorkspacePackageNames } from '../utils/workspace.js';
-import { createContext } from './utils.js';
+import { resolveProjectConfig } from './utils.js';
 
 function registerStart(program) {
     program.command("start").description("Start function emulator").option("-o, --output-dir <dir>", "Output directory").option("-P, --project <project id or alias>", "Project id or alias").action(async (options)=>{
         try {
-            const context = await createContext(options);
-            await start(context);
+            const projectConfig = await resolveProjectConfig(options);
+            await start(projectConfig);
         } catch (error) {
             console.error(error);
             process.exit(1);

package/lib/commands/unusedExports.js

@@ -9,26 +9,27 @@ import { createResolver } from '../importExports/resolve.js';
 import { createResolveImport } from '../importExports/resolveImports.js';
 import { createReadFileDependencies, extractUnusedExports } from '../importExports/unused.js';
 import { createCache } from '../importExports/utils.js';
-import { createContext } from './utils.js';
 
 function registerUnusedExports(program) {
-    program.command("unused-exports").description("Check for unused exports").action(async ()=>{
+    program.command("unused-exports").description("Check for unused exports").option("-i, --include <pattern...>", "Include glob pattern", [
+        "**/*.ts"
+    ]).option("-e, --exclude <numbers...>", "Excude glob pattern", [
+        "**/node_modules"
+    ]).option("--ignore <numbers...>", "Ignore glob pattern", []).option("--extensions <numbers...>", "File extensions to resolve", [
+        ".ts"
+    ]).action(async (options)=>{
         try {
-            const context = await createContext();
-            await unusedExports([
-                "**/*.+(ts|tsx)"
-            ], [], {
-                extensions: [
-                    ".ts"
-                ]
-            }, context);
+            const cwd = process.cwd();
+            await unusedExports(options.include, options.ignore, options.exclude, {
+                extensions: options.extensions
+            }, cwd);
         } catch (error) {
             console.error(error);
             process.exit(1);
         }
     });
 }
-async function unusedExports(patterns, ignorePatterns, resolverOptions, { cwd }) {
+async function unusedExports(patterns, ignorePatterns, excludePatterns, resolverOptions, cwd) {
     const resolver = createResolver({
         conditionNames: [
             "import",
@@ -40,15 +41,10 @@ async function unusedExports(patterns, ignorePatterns, resolverOptions, { cwd })
     });
     const resolveImport = createResolveImport(resolver, getFileExports, getFileProxyExports);
     const readFileDependencies = createReadFileDependencies(getFileImports, getFileExports, resolveImport);
-    const exclude = [
-        "**/node_modules",
-        "tools/createPackage/template",
-        "tools/dependency/mocks"
-    ];
     const fileDependencies = [];
     for await (const filePath of glob(patterns, {
         cwd,
-        exclude
+        exclude: excludePatterns
     })){
         fileDependencies.push(await readFileDependencies(join(cwd, filePath)));
     }

package/lib/commands/utils.d.ts

@@ -0,0 +1,18 @@
+type Options = {
+    outputDir?: string;
+    project?: string;
+    cwd?: string;
+};
+type ProjectConfig = {
+    pnpmWorkspaceYAML: URL;
+    packageJSON: URL;
+    outputDir: URL;
+    packageRoot: URL;
+    projectRoot: URL;
+    projectAlias: string;
+    projectId: string;
+};
+declare function resolveProjectConfig({ outputDir, project, cwd, }?: Options): Promise<ProjectConfig>;
+
+export { resolveProjectConfig };
+export type { ProjectConfig };

package/lib/commands/utils.js

@@ -2,8 +2,7 @@ import { pathToFileURL } from 'node:url';
 import { findUp } from 'find-up-simple';
 import { readJSON } from '../utils/fs.js';
 
-async function createContext({ outputDir = "dist", project } = {}) {
-    const cwd = process.cwd();
+async function resolveProjectConfig({ outputDir = "dist", project, cwd = process.cwd() } = {}) {
     const [pnpmWorkspacePath, packageJSONPath, firebaseRCPath] = await Promise.all([
         findUp("pnpm-workspace.yaml", {
             cwd
@@ -36,8 +35,7 @@ async function createContext({ outputDir = "dist", project } = {}) {
         packageRoot: new URL("./", packageJSONUrl),
         projectRoot: new URL("./", pnpmWorkspaceYAML),
         projectAlias,
-        projectId,
-        cwd
+        projectId
     };
 }
 function getProjectAliasAndId({ default: defaultProjectId, ...projects }, project) {
@@ -70,4 +68,4 @@ function getProjectAliasAndId({ default: defaultProjectId, ...projects }, projec
     throw new Error(`No project with alias or id ${project} found in .firebaserc`);
 }
 
-export { createContext };
+export { resolveProjectConfig };

package/lib/index.d.ts

@@ -1,2 +1,3 @@
+export { ProjectConfig, resolveProjectConfig } from './commands/utils.js';
 export { Export, getExports } from './importExports/exports.js';
 export { Import, getImports } from './importExports/imports.js';

package/lib/index.js

@@ -1,2 +1,3 @@
+export { resolveProjectConfig } from './commands/utils.js';
 export { getExports } from './importExports/exports.js';
 export { getImports } from './importExports/imports.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@entur/function-tools",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "publishConfig": {
     "access": "public"
   },