Merge pull request #1 from bertdeblock/ensure-consistent-output

Ensure consistent output

Author: bertdeblock

package.json

@@ -30,8 +30,8 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "change-case": "^5.4.3",
-    "fs-extra": "^11.2.0",
-    "recursive-readdir": "^2.2.3"
+    "fast-glob": "^3.3.2",
+    "fs-extra": "^11.2.0"
   },
   "devDependencies": {
     "@release-it-plugins/lerna-changelog": "^6.1.0",

pnpm-lock.yaml

@@ -1,10 +1,10 @@
 import chalk from "chalk";
 import { camelCase, pascalCase } from "change-case";
+import glob from "fast-glob";
 import { pathExists, readJson } from "fs-extra/esm";
 import { writeFile } from "node:fs/promises";
 import { join, parse } from "node:path";
 import { cwd as processCwd } from "node:process";
-import recursiveReadDir from "recursive-readdir";
 
 export async function generateTemplateRegistry(cwd = processCwd()) {
   let packageJson: any;
@@ -116,17 +116,16 @@ async function getEntries(dir: string): Promise<string[]> {
   const paths: string[] = [];
 
   if (await pathExists(dir)) {
-    const files = await recursiveReadDir(dir);
+    const files = await glob("**/*", { cwd: dir });
 
-    files.forEach((file) => {
+    files.sort().forEach((file) => {
       const parsed = parse(file);
-      const folder = parsed.dir.replace(`${dir}`, "");
 
       let path: string;
       if (parsed.name === "index") {
-        path = folder.substring(1);
+        path = parsed.dir;
       } else {
-        path = `${folder}/${parsed.name}`.substring(1);
+        path = parsed.dir ? `${parsed.dir}/${parsed.name}` : parsed.name;
       }
 
       if (paths.includes(path) === false) {

src/generate-template-registry.ts

@@ -2,16 +2,16 @@
 
 exports[`generates a template registry for a v1 addon 1`] = `
 "// Components:
-import type FooComponent from "v1-addon/components/foo";
 import type BarComponent from "v1-addon/components/bar";
+import type FooComponent from "v1-addon/components/foo";
 import type FooBarComponent from "v1-addon/components/foo/bar";
 
 export default interface Registry {
   // Components:
-  Foo: typeof FooComponent;
-  "foo": typeof FooComponent;
   Bar: typeof BarComponent;
   "bar": typeof BarComponent;
+  Foo: typeof FooComponent;
+  "foo": typeof FooComponent;
   "Foo::Bar": typeof FooBarComponent;
   "foo/bar": typeof FooBarComponent;
 }
@@ -20,16 +20,16 @@ export default interface Registry {
 
 exports[`generates a template registry for a v2 addon 1`] = `
 "// Components:
-import type FooComponent from "./components/foo";
 import type BarComponent from "./components/bar";
+import type FooComponent from "./components/foo";
 import type FooBarComponent from "./components/foo/bar";
 
 export default interface Registry {
   // Components:
-  Foo: typeof FooComponent;
-  "foo": typeof FooComponent;
   Bar: typeof BarComponent;
   "bar": typeof BarComponent;
+  Foo: typeof FooComponent;
+  "foo": typeof FooComponent;
   "Foo::Bar": typeof FooBarComponent;
   "foo/bar": typeof FooBarComponent;
 }
@@ -38,16 +38,16 @@ export default interface Registry {
 
 exports[`generates a template registry for an app 1`] = `
 "// Components:
-import type FooComponent from "app/components/foo";
 import type BarComponent from "app/components/bar";
+import type FooComponent from "app/components/foo";
 import type FooBarComponent from "app/components/foo/bar";
 
 export default interface Registry {
   // Components:
-  Foo: typeof FooComponent;
-  "foo": typeof FooComponent;
   Bar: typeof BarComponent;
   "bar": typeof BarComponent;
+  Foo: typeof FooComponent;
+  "foo": typeof FooComponent;
   "Foo::Bar": typeof FooBarComponent;
   "foo/bar": typeof FooBarComponent;
 }