load-populate-files 1.0.0 → 1.0.2

package/README.md

@@ -4,7 +4,7 @@
 Load and dynamically populate file content based on a single file's config.
 
 [![npm package](https://badge.fury.io/js/load-populate-files.svg)](https://www.npmjs.com/package/load-populate-files)
-[![License](https://img.shields.io/npm/l/load-populate-files.svg)](https://github.com/JacobLey/leyman/blob/main/tools/load-populate-files/LICENSE)
+[![License](https://img.shields.io/npm/l/load-populate-files.svg)](https://github.com/JacobLey/leyman/blob/main/apps/populate-files/load-populate-files/LICENSE)
 
 </div>
 

package/dist/bin.d.ts

@@ -1,2 +1,3 @@
-export { LoadPopulateFilesCli as default } from './cli.js';
+declare const _default: import("haywire-launcher").WrapperMain;
+export default _default;
 //# sourceMappingURL=bin.d.ts.map

package/dist/bin.js

@@ -1,3 +1,7 @@
-export { LoadPopulateFilesCli as default } from './cli.js';
+import { identifier } from 'haywire';
+import { launch } from 'haywire-launcher';
+import { LoadPopulateFilesCli } from './cli.js';
+import { cliContainer } from './container.js';
+export default launch(cliContainer, identifier(LoadPopulateFilesCli));
 
 //# sourceMappingURL=bin.js.map

package/dist/cli.d.ts

@@ -1,11 +1,16 @@
-import { EntryScript } from 'entry-script';
+import type { Main } from 'entry-script';
+import type { RegisterCommand } from './commands/lib/types.js';
 /**
  * LoadPopulateFiles CLI. Run `./bin.mjs --help` for options.
  *
  * Uses `yargs` package for command line parsing and logic flow.
  */
-export declare class LoadPopulateFilesCli extends EntryScript {
+export declare class LoadPopulateFilesCli implements Main {
     #private;
+    /**
+     * @param commands - every command the CLI runs
+     */
+    constructor(commands: readonly RegisterCommand[]);
     /**
      * Entry point to CLI script.
      *
@@ -13,6 +18,7 @@ export declare class LoadPopulateFilesCli extends EntryScript {
      *
      * @param argv - process arguments
      */
-    static main(argv: string[]): Promise<void>;
+    main(argv: string[]): Promise<void>;
 }
+export declare const loadPopulateFilesCliBinding: import("haywire").Binding<import("haywire").OutputHaywireId<import("haywire").HaywireId<LoadPopulateFilesCli, typeof LoadPopulateFilesCli, null, false, false, false, false, false>>, [import("haywire").HaywireId<RegisterCommand, null, null, true, false, false, false, false>], false>;
 //# sourceMappingURL=cli.d.ts.map

package/dist/cli.js

@@ -1,14 +1,18 @@
 import yargs from 'yargs';
-import { EntryScript } from "entry-script";
-import { loadPopulateFilesCommand } from './commands/load-populate-files-command.js';
-export class LoadPopulateFilesCli extends EntryScript {
-    static async main(argv) {
+import { bind } from 'haywire';
+import { commandId } from './commands/lib/types.js';
+export class LoadPopulateFilesCli {
+    #commands;
+    constructor(commands){
+        this.#commands = commands;
+    }
+    async main(argv) {
         const packageJson = await import('../package.json', {
             with: {
                 type: 'json'
             }
         });
-        await yargs().scriptName('load-populate-files').option({
+        let cli = yargs().scriptName('load-populate-files').option({
             cwd: {
                 type: 'string',
                 default: '.',
@@ -20,7 +24,11 @@ export class LoadPopulateFilesCli extends EntryScript {
                 describe: 'Target directory for resolving output file paths. Defaults to resolved cwd.',
                 alias: 't'
             }
-        }).strict().help().alias('help', 'info').version(packageJson.default.version).command(loadPopulateFilesCommand).parseAsync(argv, {}, LoadPopulateFilesCli.#yargsOutput);
+        }).strict().help().alias('help', 'info').version(packageJson.default.version);
+        for (const register of this.#commands){
+            cli = register(cli);
+        }
+        await cli.parseAsync(argv, {}, LoadPopulateFilesCli.#yargsOutput);
     }
     static #yargsOutput(e, _argv, log) {
         if (e) {
@@ -33,5 +41,8 @@ export class LoadPopulateFilesCli extends EntryScript {
         }
     }
 }
+export const loadPopulateFilesCliBinding = bind(LoadPopulateFilesCli).withDependencies([
+    commandId
+]).withConstructorProvider();
 
 //# sourceMappingURL=cli.js.map

package/dist/commands/lib/types.d.ts

@@ -1,7 +1,20 @@
-import type { CommandModule } from 'yargs';
+import type { Argv, CommandModule } from 'yargs';
 export interface LoadPopulateFilesCommandInput {
     cwd: string;
     targetDir: string;
 }
 export type Command<ExtendedInput extends LoadPopulateFilesCommandInput> = Pick<CommandModule<LoadPopulateFilesCommandInput, ExtendedInput>, 'builder' | 'command' | 'describe' | 'handler'>;
+/**
+ * Adds a command to the CLI.
+ *
+ * Commands differ in the input their handler receives, so they cannot share an element type.
+ * Wrapping each in a function that registers it keeps every command type-checked against its own input.
+ */
+export type RegisterCommand = (cli: Argv<LoadPopulateFilesCommandInput>) => Argv<LoadPopulateFilesCommandInput>;
+/**
+ * Every command the CLI runs. Each command binds itself:
+ *
+ * `bind(commandId).withInstance(cli => cli.command(myCommand))`
+ */
+export declare const commandId: import("haywire").HaywireId<RegisterCommand, null, null, true, false, false, false, false>;
 //# sourceMappingURL=types.d.ts.map

package/dist/commands/lib/types.js

@@ -1,3 +1,4 @@
-export { };
+import { identifier } from 'haywire';
+export const commandId = identifier().list();
 
 //# sourceMappingURL=types.js.map

package/dist/commands/load-populate-files-command.d.ts

@@ -9,5 +9,6 @@ interface LoadPopulateFilesCommandExtendedInput extends LoadPopulateFilesCommand
  * Main `load-populate-files` command
  */
 export declare const loadPopulateFilesCommand: Command<LoadPopulateFilesCommandExtendedInput>;
+export declare const loadPopulateFilesCommandBinding: import("haywire").Binding<import("haywire").OutputHaywireId<import("haywire").HaywireId<import("./lib/types.js").RegisterCommand, null, null, true, false, false, false, false>>, [], false>;
 export {};
 //# sourceMappingURL=load-populate-files-command.d.ts.map

package/dist/commands/load-populate-files-command.js

@@ -1,5 +1,7 @@
 import { isCI } from 'ci-info';
+import { bind } from 'haywire';
 import { loadAndPopulateFiles } from '../lib/load-populate-files.js';
+import { commandId } from './lib/types.js';
 export const loadPopulateFilesCommand = {
     command: [
         '$0',
@@ -41,5 +43,6 @@ export const loadPopulateFilesCommand = {
         });
     }
 };
+export const loadPopulateFilesCommandBinding = bind(commandId).withInstance((cli)=>cli.command(loadPopulateFilesCommand));
 
 //# sourceMappingURL=load-populate-files-command.js.map

package/dist/container.d.ts

@@ -0,0 +1,3 @@
+export declare const cliModule: import("haywire").Module<[import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, false, false>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, false, true>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, true, false>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, true, true>], [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, false, false>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, false, true>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, true, false>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, true, true>], [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, false, false>], false>;
+export declare const cliContainer: import("haywire").SyncContainer<[import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, false, false>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, false, true>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, true, false>] | [import("haywire").NonExtendable<import("./cli.js").LoadPopulateFilesCli, typeof import("./cli.js").LoadPopulateFilesCli, null, false, true, true>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, false, false>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, false, true>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, true, false>] | [import("haywire").NonExtendable<import("./commands/lib/types.js").RegisterCommand, null, null, true, true, true>]>;
+//# sourceMappingURL=container.d.ts.map

package/dist/container.js

@@ -0,0 +1,7 @@
+import { createContainer, createModule } from 'haywire';
+import { loadPopulateFilesCliBinding } from './cli.js';
+import { loadPopulateFilesCommandBinding } from './commands/load-populate-files-command.js';
+export const cliModule = createModule(loadPopulateFilesCliBinding).addBinding(loadPopulateFilesCommandBinding);
+export const cliContainer = createContainer(cliModule);
+
+//# sourceMappingURL=container.js.map

package/dist/lib/lib/populate-files-validator.d.ts

@@ -1,14 +1,8 @@
-export declare const isPopulateFileParams: (x: unknown) => x is (Partial<{
+export declare const isPopulateFileParams: (x: unknown) => x is {
     filePath: string;
-    content: Promise<import("populate-files").FileContent> | import("populate-files").FileContent;
-}> & Required<Pick<{
+    content: (Promise<import("populate-files").FileContent> | import("populate-files").FileContent | undefined) & (Promise<import("populate-files").FileContent> | import("populate-files").FileContent);
+}[] | {
     filePath: string;
-    content: Promise<import("populate-files").FileContent> | import("populate-files").FileContent;
-}, "content" | "filePath">>)[] | (Partial<{
-    filePath: string;
-    content: Promise<import("populate-files").FileContent> | import("populate-files").FileContent;
-}> & Required<Pick<{
-    filePath: string;
-    content: Promise<import("populate-files").FileContent> | import("populate-files").FileContent;
-}, "content" | "filePath">>);
+    content: (Promise<import("populate-files").FileContent> | import("populate-files").FileContent | undefined) & (Promise<import("populate-files").FileContent> | import("populate-files").FileContent);
+};
 //# sourceMappingURL=populate-files-validator.d.ts.map

package/dist/lib/loader.js

@@ -1,12 +1,17 @@
 import { defaultImport } from 'default-import';
 import { isPopulateFileParams } from './lib/populate-files-validator.js';
 export const loadFile = async (filePath)=>{
-    const mod = await import(filePath).catch((err)=>{
+    let mod;
+    try {
+        mod = await import(filePath);
+    } catch (err) {
         if (String(err).includes('ERR_MODULE_NOT_FOUND')) {
-            throw new Error(`JS file not found: ${filePath}`);
+            throw new Error(`JS file not found: ${filePath}`, {
+                cause: err
+            });
         }
         throw err;
-    });
+    }
     const params = defaultImport(mod);
     if (isPopulateFileParams(params)) {
         return [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "load-populate-files",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Load and dynamically populate file content",
   "engines": {
     "node": ">=24"
@@ -10,7 +10,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "JacobLey/leyman"
+    "url": "git+https://github.com/JacobLey/leyman.git",
+    "directory": "apps/populate-files/load-populate-files"
   },
   "homepage": "https://github.com/JacobLey/leyman/tree/main/apps/populate-files/load-populate-files#readme",
   "bugs": {
@@ -26,17 +27,25 @@
   "exports": {
     ".": "./dist/index.js"
   },
+  "files": [
+    "dist",
+    "!dist/**/*.map",
+    "!dist/tsconfig.tsbuildinfo",
+    "bin.mjs"
+  ],
   "bin": {
     "load-populate-files": "./bin.mjs"
   },
   "dependencies": {
     "ci-info": "^4.4.0",
-    "default-import": "^3.0.0",
-    "entry-script": "^4.0.0",
-    "juniper": "^2.0.0",
-    "juniper-validator": "^0.1.0",
-    "parse-cwd": "^2.0.0",
-    "populate-files": "^1.0.0",
+    "default-import": "^3.0.1",
+    "entry-script": "^4.1.0",
+    "haywire": "^1.1.1",
+    "haywire-launcher": "^1.0.1",
+    "juniper": "^2.2.0",
+    "juniper-validator": "^0.2.1",
+    "parse-cwd": "^2.0.2",
+    "populate-files": "^1.0.1",
     "yargs": "^18.2.0"
   },
   "devDependencies": {
@@ -50,9 +59,9 @@
     "@types/yargs": "^17.0.35",
     "@typescript/native": "npm:typescript@^7.0.2",
     "c8": "^12.0.0",
-    "eslint": "^9.39.5",
+    "eslint": "^10.12.0",
     "mocha": "^12.0.2",
-    "mocha-chain": "^1.0.0",
+    "mocha-chain": "^1.0.1",
     "typescript": "npm:@typescript/typescript6@^6.0.2"
   },
   "imports": {

package/.npmignore

@@ -1,13 +0,0 @@
-CHANGELOG.md
-project.json
-tsconfig.json
-
-coverage/**
-eslint.config.js
-
-dist/tsconfig.tsbuildinfo
-dist/**/*.map
-dist-test/**
-test/**
-
-src/**