@repokit/core 0.0.9 → 0.1.0

package/dist/cjs/CommandParser.js

@@ -16,6 +16,7 @@ const promises_1 = require("node:fs/promises");
 const node_fs_1 = require("node:fs");
 const TaskPooler_1 = require("./TaskPooler");
 const RepoKitCommand_1 = require("./RepoKitCommand");
+/* oxlint-disable typescript-eslint(no-misused-spread) */
 class CommandParser {
     static parse() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -35,7 +36,7 @@ class CommandParser {
             const declaredExports = yield Promise.resolve(`${path}`).then(s => require(s));
             for (const key in declaredExports) {
                 if (declaredExports[key] instanceof RepoKitCommand_1.RepoKitCommand) {
-                    commands.push(Object.assign(Object.assign({}, declaredExports[key].toJSON()), { location: path }));
+                    commands.push(Object.assign(Object.assign({}, declaredExports[key]), { location: path }));
                 }
             }
             return commands;

package/dist/cjs/RepoKitCommand.js

@@ -8,9 +8,5 @@ class RepoKitCommand {
         this.commands = commands;
         this.description = description;
     }
-    toJSON() {
-        const { name, owner, commands, description } = this;
-        return { name, owner, commands, description };
-    }
 }
 exports.RepoKitCommand = RepoKitCommand;

package/dist/mjs/CommandParser.js

@@ -4,6 +4,7 @@ import { stat } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { TaskPooler } from "./TaskPooler.js";
 import { RepoKitCommand } from "./RepoKitCommand.js";
+/* oxlint-disable typescript-eslint(no-misused-spread) */
 export class CommandParser {
     static async parse() {
         const { paths, root } = this.parsePaths();
@@ -20,7 +21,7 @@ export class CommandParser {
         const declaredExports = await import(path);
         for (const key in declaredExports) {
             if (declaredExports[key] instanceof RepoKitCommand) {
-                commands.push({ ...declaredExports[key].toJSON(), location: path });
+                commands.push({ ...declaredExports[key], location: path });
             }
         }
         return commands;

package/dist/mjs/RepoKitCommand.js

@@ -9,8 +9,4 @@ export class RepoKitCommand {
         this.commands = commands;
         this.description = description;
     }
-    toJSON() {
-        const { name, owner, commands, description } = this;
-        return { name, owner, commands, description };
-    }
 }

package/dist/types/RepoKitCommand.d.ts

@@ -5,10 +5,4 @@ export declare class RepoKitCommand {
     description: string;
     commands: Record<string, ICommand>;
     constructor({ name, description, owner, commands, }: IRepoKitCommand);
-    toJSON(): {
-        name: string;
-        owner: string;
-        commands: Record<string, ICommand>;
-        description: string;
-    };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@repokit/core",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "description": "A knowledgebase for your repository - wrapped in a CLI",
   "homepage": "https://github.com/alexfigliolia/repokit#readme",
   "license": "MIT",
@@ -23,11 +23,12 @@
     "access": "public"
   },
   "scripts": {
-    "build:all": "yarn build:ts && yarn lint:all && yarn install:repokit",
+    "build:all": "yarn build:ts && yarn lint:ts && yarn lint:rust && yarn install:repokit",
     "build:rust": "cargo build --release",
     "build:ts": "yarn ts-packager -e src",
     "install:repokit": "yarn build:rust && cargo install --path .",
-    "lint:all": "repokit format:rust && repokit lint:ts",
+    "lint:rust": "cargo clippy --fix --allow-dirty",
+    "lint:ts": "yarn oxlint --type-aware --type-check --report-unused-disable-directives --fix && yarn oxfmt",
     "postinstall": "chmod +x ./install.sh && ./install.sh",
     "repokit": "yarn build:ts && yarn install:repokit && repokit",
     "run:dev": "cargo run --package repokit --bin repokit"

package/src/CommandParser.ts

@@ -6,6 +6,7 @@ import { existsSync } from "node:fs";
 import type { ILocatedCommand } from "./types";
 import { TaskPooler } from "./TaskPooler";
 import { RepoKitCommand } from "./RepoKitCommand";
+/* oxlint-disable typescript-eslint(no-misused-spread) */
 
 export class CommandParser {
   public static async parse() {
@@ -28,7 +29,7 @@ export class CommandParser {
     const declaredExports = await import(path);
     for (const key in declaredExports) {
       if (declaredExports[key] instanceof RepoKitCommand) {
-        commands.push({ ...declaredExports[key].toJSON(), location: path });
+        commands.push({ ...declaredExports[key], location: path });
       }
     }
     return commands;

package/src/RepoKitCommand.ts

@@ -16,9 +16,4 @@ export class RepoKitCommand {
     this.commands = commands;
     this.description = description;
   }
-
-  public toJSON() {
-    const { name, owner, commands, description } = this;
-    return { name, owner, commands, description };
-  }
 }

package/workspaces/internal_filesystem/internal_filesystem.rs

@@ -11,26 +11,44 @@ impl InternalFileSystem {
     }
 
     pub fn commands_directory() -> PathBuf {
-        InternalFileSystem::absolute("./src/commands")
+        InternalFileSystem::source_internal("commands")
     }
 
     pub fn templates_directory() -> PathBuf {
-        InternalFileSystem::absolute("./src/templates")
+        InternalFileSystem::source_internal("templates")
     }
 
     pub fn resolve_command(file_name: &str) -> String {
-        InternalFileSystem::commands_directory()
-            .join(file_name)
-            .into_os_string()
-            .into_string()
-            .expect("Cannot construct path")
+        InternalFileSystem::path_buf_to_str(
+            InternalFileSystem::commands_directory().join(file_name),
+        )
     }
 
     pub fn resolve_template(file_name: &str) -> String {
-        InternalFileSystem::templates_directory()
-            .join(file_name)
+        InternalFileSystem::path_buf_to_str(
+            InternalFileSystem::templates_directory().join(file_name),
+        )
+    }
+
+    fn source_internal(path: &str) -> PathBuf {
+        let src = InternalFileSystem::absolute(format!("./src/{path}").as_str());
+        if InternalFileSystem::is_in_node_modules(&src) {
+            return InternalFileSystem::absolute(format!("./dist/{path}").as_str());
+        }
+        src
+    }
+
+    fn path_buf_to_str(buffer: PathBuf) -> String {
+        buffer
             .into_os_string()
             .into_string()
             .expect("Cannot construct path")
     }
+
+    fn is_in_node_modules(path: &PathBuf) -> bool {
+        path.as_os_str()
+            .to_str()
+            .expect("blah")
+            .contains("node_modules")
+    }
 }