rbxts-transformer-commit-migrations 1.0.0 → 1.0.2

package/bin/init.js

@@ -11,19 +11,20 @@ const huskyDir = resolve(dir, ".husky");
 const hookFile = resolve(huskyDir, "pre-commit");
 
 if (!existsSync(huskyDir)) {
-  console.error("No .husky folder found. Run `npx husky init` first.");
-  process.exit(1);
+	console.error("No .husky folder found. Run `npx husky init` first.");
+	process.exit(1);
 }
 
 const setupResolve = `npx resolve-commit-migrations\n`;
 
 if (existsSync(hookFile)) {
-  const existing = readFileSync(hookFile, "utf-8");
-  if (!existing.includes(setupResolve)) {
-    writeFileSync(hookFile, existing + setupResolve);
-  }
+	const existing = readFileSync(hookFile, "utf-8");
+	
+	if (!existing.includes(setupResolve)) {
+		writeFileSync(hookFile, existing + `\n${setupResolve}`);
+	}
 } else {
-  writeFileSync(hookFile, `#!/bin/sh\n${setupResolve}`);
+	writeFileSync(hookFile, setupResolve);
 }
 
-console.log("Added rbxts-macro stamp to .husky/pre-commit");
+console.log("Added commit-migration macro stamp to .husky/pre-commit");

package/index.d.ts

@@ -1,3 +1,3 @@
-declare function $migrate(order: number): never;
-declare function $migrate(order: "__resolved"): number;
-declare function $migrate(order: number | "__resolved"): number?;
+export declare function $migrate(order: number): never;
+export declare function $migrate(order: "__resolved"): number;
+export declare function $migrate(order: number | "__resolved"): number | undefined;

package/out/cli/resolveMacros.js

@@ -29,11 +29,7 @@ function walk(node, ctx) {
         const entry = findEntryName(node);
         const orderArg = node.arguments[0];
         const order = orderArg ? ts.isNumericLiteral(orderArg) ? parseInt(orderArg.getText()) : null : 0;
-        if (order === null) {
-            console.error("Recieved null order when resolving migration macros.");
-            process.exit(1);
-        }
-        if (usedOrders.has(order)) {
+        if (order !== null && usedOrders.has(order)) {
             console.error("Multiple of the same migration orders found. Every migration has to have a unique order.");
             process.exit(1);
         }
@@ -42,8 +38,10 @@ function walk(node, ctx) {
             process.exit(1);
         }
         if (!orderArg?.getText().includes("__resolved")) {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             usedOrders.add(order);
-            migrationData[entry] = { timestamp: Date.now(), order };
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            migrationData[entry] = { timestamp: Date.now(), order: order };
             ctx.changed = true;
         }
         migrations.push(entry);

package/out/index.js

@@ -2,19 +2,26 @@ import ts from "typescript";
 import { findMacroCall, replaceMacroCall } from "./macro.js";
 import loadMigrationEntries from "./util/loadMigrationEntries.js";
 import { CONFIG } from "./config.js";
-export default function (_) {
+import { existsSync } from "node:fs";
+export default function (_, config) {
     return (ctx) => {
+        const configPath = config?.configPath ?? CONFIG;
+        if (!existsSync(configPath)) {
+            console.error(`Invalid migration config path ${configPath}`);
+            process.exit(1);
+        }
+        const [entryArr, entries] = loadMigrationEntries(configPath);
+        const orderedEntries = entryArr
+            .map((i) => ({ i, timestamp: entries[i].timestamp, order: entries[i].order }))
+            .toSorted((a, b) => a.timestamp - b.timestamp || a.order - b.order)
+            .map(({ i }) => i);
         return (file) => {
-            const [entryArr, entries] = loadMigrationEntries(CONFIG);
-            const orderedEntries = entryArr
-                .map((i) => ({ i, timestamp: entries[i].timestamp, order: entries[i].order }))
-                .toSorted((a, b) => a.timestamp - b.timestamp || a.order - b.order)
-                .map(({ i }) => i);
-            console.log(orderedEntries);
+            if (config?.files && !config.files.some((f) => file.fileName.includes(f)))
+                return file;
             function visit(node) {
                 if (!ts.isPropertyAssignment(node) || !findMacroCall(node.initializer))
                     return ts.visitEachChild(node, visit, ctx);
-                const entry = node.name.getText(file);
+                const entry = ts.isIdentifier(node.name) ? node.name.text : node.name.getText(file);
                 const replacement = orderedEntries.indexOf(entry);
                 if (replacement !== -1) {
                     const newInit = replaceMacroCall(node.initializer, replacement);

package/out/util/loadMigrationEntries.js

@@ -30,7 +30,6 @@ export default function (config) {
                 continue;
             result.push(prop.name.text);
             object[prop.name.text] = reconstructProperties(prop.initializer.properties);
-            console.log(reconstructProperties(prop.initializer.properties));
         }
         return [result, object];
     }

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "rbxts-transformer-commit-migrations",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "rbxts transformer used in user data migration builder chains",
   "main": "out/index.js",
-  "typegis": "index.d.ts",
   "type": "module",
   "scripts": {
     "build": "tsc"