rps-flagforge 1.0.8 ā†’ 1.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/bin/mergeSchema.js +49 -35
  2. package/dist/bin/mergeSchema.js.map +1 -1
  3. package/package.json +1 -1
package/dist/bin/mergeSchema.js CHANGED
@@ -40,41 +40,52 @@ function extractBlocks(schema, type) {
40
40
  function stripNonStructuralBlocks(schema) {
41
41
  return schema.replace(/generator\s+\w+\s+{[\s\S]*?}\n?/g, "").replace(/datasource\s+\w+\s+{[\s\S]*?}\n?/g, "");
42
42
  }
43
- function parseBlock(block) {
44
- const lines = block.split("\n").map((l) => l.trim()).filter((l) => l && !l.startsWith("//") && !l.startsWith("model") && !l.startsWith("enum") && !l.startsWith("{") && !l.startsWith("}"));
45
- return lines;
43
+ function parseBlockFields(block) {
44
+ return block.split("\n").map((l) => l.trim()).filter(
45
+ (l) => l && !l.startsWith("//") && !l.startsWith("model") && !l.startsWith("enum") && !l.startsWith("{") && !l.startsWith("}")
46
+ );
46
47
  }
47
48
  function mergeModelFields(existing, incoming) {
48
- const existingFields = parseBlock(existing);
49
- const incomingFields = parseBlock(incoming);
50
- const newFields = incomingFields.filter((f) => !existingFields.includes(f));
51
- const mergedLines = [...existingFields, ...newFields];
49
+ const existingFields = parseBlockFields(existing);
50
+ const incomingFields = parseBlockFields(incoming);
51
+ const mergedFields = [...existingFields];
52
+ const newLines = [];
53
+ const existingMap = new Map(existingFields.map((f) => [f.split(" ")[0], f]));
54
+ for (const line of incomingFields) {
55
+ const name = line.split(" ")[0];
56
+ if (!existingMap.has(name)) {
57
+ mergedFields.push(line);
58
+ newLines.push(`+ ${line}`);
59
+ } else if (existingMap.get(name) !== line) {
60
+ const index = mergedFields.findIndex((f) => f.split(" ")[0] === name);
61
+ mergedFields[index] = line;
62
+ newLines.push(`~ ${line}`);
63
+ }
64
+ }
52
65
  const mergedBlock = existing.replace(/\{[\s\S]*\}/, `{
53
- ${mergedLines.join("\n ")}
66
+ ${mergedFields.join("\n ")}
54
67
  }`);
55
- return { mergedBlock, newLines: newFields };
68
+ return { mergedBlock, newLines };
56
69
  }
57
70
  function mergeEnumValues(existing, incoming) {
58
- const existingValues = parseBlock(existing);
59
- const incomingValues = parseBlock(incoming);
60
- const newValues = incomingValues.filter((v) => !existingValues.includes(v));
61
- const mergedLines = [...existingValues, ...newValues];
71
+ const existingValues = parseBlockFields(existing);
72
+ const incomingValues = parseBlockFields(incoming);
73
+ const mergedValues = [...existingValues];
74
+ const newLines = [];
75
+ for (const v of incomingValues) {
76
+ if (!existingValues.includes(v)) {
77
+ mergedValues.push(v);
78
+ newLines.push(`+ ${v}`);
79
+ }
80
+ }
62
81
  const mergedBlock = existing.replace(/\{[\s\S]*\}/, `{
63
- ${mergedLines.join("\n ")}
82
+ ${mergedValues.join("\n ")}
64
83
  }`);
65
- return { mergedBlock, newLines: newValues };
66
- }
67
- function diffPreview(existing, newLines) {
68
- const existingSet = new Set(parseBlock(existing));
69
- return existing.split("\n").map((line) => {
70
- const trimmed = line.trim();
71
- if (newLines.includes(trimmed) && !existingSet.has(trimmed)) return import_chalk.default.green(`+ ${line}`);
72
- return ` ${line}`;
73
- }).join("\n");
84
+ return { mergedBlock, newLines };
74
85
  }
75
86
  async function main() {
76
- console.log(import_chalk.default.blueBright.bold("\n\u26A1 FlagsForge Prisma Schema Merger\n"));
77
- if (isDryRun) console.log(import_chalk.default.cyan("\u{1F50D} Running in DRY RUN mode\n"));
87
+ console.log(import_chalk.default.blueBright.bold("\n\u26A1 FlagsForge Prisma Schema Smart Merger\n"));
88
+ if (isDryRun) console.log(import_chalk.default.cyan("\u{1F50D} Dry run: preview all changes\n"));
78
89
  if (isForce) console.log(import_chalk.default.yellow("\u26A0\uFE0F Force mode enabled (skipping backup prompts)\n"));
79
90
  if (!import_fs.default.existsSync(appSchema)) {
80
91
  console.error(import_chalk.default.red("\u274C App schema not found at prisma/schema.prisma"));
@@ -101,10 +112,10 @@ async function main() {
101
112
  if (existingIndex >= 0) {
102
113
  const { mergedBlock, newLines } = mergeModelFields(mergedModels[existingIndex], pModel);
103
114
  mergedModels[existingIndex] = mergedBlock;
104
- if (newLines.length > 0) modelDiffs.push(diffPreview(mergedModels[existingIndex], newLines));
115
+ modelDiffs.push(...newLines);
105
116
  } else {
106
117
  mergedModels.push(pModel);
107
- modelDiffs.push(import_chalk.default.green(`+ ${pModel}`));
118
+ modelDiffs.push(`+ New model: ${name}`);
108
119
  }
109
120
  }
110
121
  const mergedEnums = [...appEnums];
@@ -117,23 +128,26 @@ async function main() {
117
128
  if (existingIndex >= 0) {
118
129
  const { mergedBlock, newLines } = mergeEnumValues(mergedEnums[existingIndex], pEnum);
119
130
  mergedEnums[existingIndex] = mergedBlock;
120
- if (newLines.length > 0) enumDiffs.push(diffPreview(mergedEnums[existingIndex], newLines));
131
+ enumDiffs.push(...newLines);
121
132
  } else {
122
133
  mergedEnums.push(pEnum);
123
- enumDiffs.push(import_chalk.default.green(`+ ${pEnum}`));
134
+ enumDiffs.push(`+ New enum: ${name}`);
124
135
  }
125
136
  }
126
- if (mergedModels.length === appModels.length && mergedEnums.length === appEnums.length) {
127
- console.log(import_chalk.default.yellow("\u26A0\uFE0F No new models or enums to merge.\n"));
137
+ if (modelDiffs.length === 0 && enumDiffs.length === 0) {
138
+ console.log(import_chalk.default.yellow("\u26A0\uFE0F No changes detected.\n"));
128
139
  process.exit(0);
129
140
  }
130
- let mergedContent = appContent.trim();
131
- mergedContent += "\n\n// ------------------------------\n// FlagsForge Schema Extensions\n// ------------------------------\n\n" + [...mergedEnums, ...mergedModels].join("\n\n");
141
+ const mergedContent = appContent.trim() + "\n\n// ------------------------------\n// FlagsForge Schema Extensions\n// ------------------------------\n\n" + [...mergedEnums, ...mergedModels].join("\n\n");
132
142
  if (isDryRun) {
133
143
  console.log(import_chalk.default.gray("----- FULL MERGE DIFF -----\n"));
134
- [...enumDiffs, ...modelDiffs].forEach((diff) => console.log(diff));
144
+ [...enumDiffs, ...modelDiffs].forEach((line) => {
145
+ if (line.startsWith("+")) console.log(import_chalk.default.green(line));
146
+ else if (line.startsWith("~")) console.log(import_chalk.default.yellow(line));
147
+ else console.log(line);
148
+ });
135
149
  console.log(import_chalk.default.gray("\n------------------------------"));
136
- console.log(import_chalk.default.cyan("\n\u2728 Dry run complete. No changes were made.\n"));
150
+ console.log(import_chalk.default.cyan("\u2728 Dry run complete. No changes were made.\n"));
137
151
  process.exit(0);
138
152
  }
139
153
  let shouldBackup = true;
package/dist/bin/mergeSchema.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../../bin/mergeSchema.ts"],"sourcesContent":["#!/usr/bin/env node\r\nimport fs from \"fs\";\r\nimport path from \"path\";\r\nimport chalk from \"chalk\";\r\nimport prompts from \"prompts\";\r\n\r\n// -----------------------------\r\n// CLI Flags\r\n// -----------------------------\r\nconst args = process.argv.slice(2);\r\nconst isDryRun = args.includes(\"--dry-run\");\r\nconst isForce = args.includes(\"--force\");\r\n\r\n// -----------------------------\r\n// Paths\r\n// -----------------------------\r\nconst appSchema = path.resolve(process.cwd(), \"prisma/schema.prisma\");\r\nconst packageSchema = path.resolve(__dirname, \"../../prisma/schema.prisma\");\r\n\r\n// -----------------------------\r\n// Helpers\r\n// -----------------------------\r\nfunction extractBlocks(schema: string, type: \"model\" | \"enum\"): string[] {\r\n const regex = new RegExp(`${type}\\\\s+\\\\w+\\\\s+{[\\\\s\\\\S]*?}\\\\n?`, \"g\");\r\n return schema.match(regex) || [];\r\n}\r\n\r\nfunction extractNames(schema: string, type: \"model\" | \"enum\"): string[] {\r\n const regex = new RegExp(`${type}\\\\s+(\\\\w+)\\\\s+{`, \"g\");\r\n const names: string[] = [];\r\n let match;\r\n while ((match = regex.exec(schema)) !== null) {\r\n names.push(match[1]);\r\n }\r\n return names;\r\n}\r\n\r\nfunction stripNonStructuralBlocks(schema: string) {\r\n return schema\r\n .replace(/generator\\s+\\w+\\s+{[\\s\\S]*?}\\n?/g, \"\")\r\n .replace(/datasource\\s+\\w+\\s+{[\\s\\S]*?}\\n?/g, \"\");\r\n}\r\n\r\nfunction parseBlock(block: string) {\r\n const lines = block\r\n .split(\"\\n\")\r\n .map(l => l.trim())\r\n .filter(l => l && !l.startsWith(\"//\") && !l.startsWith(\"model\") && !l.startsWith(\"enum\") && !l.startsWith(\"{\") && !l.startsWith(\"}\"));\r\n return lines;\r\n}\r\n\r\nfunction mergeModelFields(existing: string, incoming: string) {\r\n const existingFields = parseBlock(existing);\r\n const incomingFields = parseBlock(incoming);\r\n const newFields = incomingFields.filter(f => !existingFields.includes(f));\r\n const mergedLines = [...existingFields, ...newFields];\r\n const mergedBlock = existing.replace(/\\{[\\s\\S]*\\}/, `{ \\n ${mergedLines.join(\"\\n \")} \\n}`);\r\n return { mergedBlock, newLines: newFields };\r\n}\r\n\r\nfunction mergeEnumValues(existing: string, incoming: string) {\r\n const existingValues = parseBlock(existing);\r\n const incomingValues = parseBlock(incoming);\r\n const newValues = incomingValues.filter(v => !existingValues.includes(v));\r\n const mergedLines = [...existingValues, ...newValues];\r\n const mergedBlock = existing.replace(/\\{[\\s\\S]*\\}/, `{ \\n ${mergedLines.join(\"\\n \")} \\n}`);\r\n return { mergedBlock, newLines: newValues };\r\n}\r\n\r\n// Colorize diff\r\nfunction diffPreview(existing: string, newLines: string[]) {\r\n const existingSet = new Set(parseBlock(existing));\r\n return existing\r\n .split(\"\\n\")\r\n .map(line => {\r\n const trimmed = line.trim();\r\n if (newLines.includes(trimmed) && !existingSet.has(trimmed)) return chalk.green(`+ ${line}`);\r\n return ` ${line}`;\r\n })\r\n .join(\"\\n\");\r\n}\r\n\r\n// -----------------------------\r\n// Main\r\n// -----------------------------\r\nasync function main() {\r\n console.log(chalk.blueBright.bold(\"\\nāš” FlagsForge Prisma Schema Merger\\n\"));\r\n\r\n if (isDryRun) console.log(chalk.cyan(\"šŸ” Running in DRY RUN mode\\n\"));\r\n if (isForce) console.log(chalk.yellow(\"āš ļø Force mode enabled (skipping backup prompts)\\n\"));\r\n\r\n // Validate files\r\n if (!fs.existsSync(appSchema)) {\r\n console.error(chalk.red(\"āŒ App schema not found at prisma/schema.prisma\"));\r\n process.exit(1);\r\n }\r\n\r\n if (!fs.existsSync(packageSchema)) {\r\n console.error(chalk.red(\"āŒ Package Prisma models not found\"));\r\n process.exit(1);\r\n }\r\n\r\n const appContent = fs.readFileSync(appSchema, \"utf-8\");\r\n const packageRaw = fs.readFileSync(packageSchema, \"utf-8\");\r\n const packageContent = stripNonStructuralBlocks(packageRaw);\r\n\r\n const appModels = extractBlocks(appContent, \"model\");\r\n const appEnums = extractBlocks(appContent, \"enum\");\r\n const packageModels = extractBlocks(packageContent, \"model\");\r\n const packageEnums = extractBlocks(packageContent, \"enum\");\r\n\r\n // Merge models with diff tracking\r\n const mergedModels: string[] = [...appModels];\r\n const modelDiffs: string[] = [];\r\n for (const pModel of packageModels) {\r\n const match = pModel.match(/model\\s+(\\w+)\\s+{/);\r\n if (!match) continue;\r\n const name = match[1];\r\n const existingIndex = mergedModels.findIndex(m => m.match(new RegExp(`model\\\\s+${name}\\\\s+{`)));\r\n if (existingIndex >= 0) {\r\n const { mergedBlock, newLines } = mergeModelFields(mergedModels[existingIndex], pModel);\r\n mergedModels[existingIndex] = mergedBlock;\r\n if (newLines.length > 0) modelDiffs.push(diffPreview(mergedModels[existingIndex], newLines));\r\n } else {\r\n mergedModels.push(pModel);\r\n modelDiffs.push(chalk.green(`+ ${pModel}`));\r\n }\r\n }\r\n\r\n // Merge enums with diff tracking\r\n const mergedEnums: string[] = [...appEnums];\r\n const enumDiffs: string[] = [];\r\n for (const pEnum of packageEnums) {\r\n const match = pEnum.match(/enum\\s+(\\w+)\\s+{/);\r\n if (!match) continue;\r\n const name = match[1];\r\n const existingIndex = mergedEnums.findIndex(e => e.match(new RegExp(`enum\\\\s+${name}\\\\s+{`)));\r\n if (existingIndex >= 0) {\r\n const { mergedBlock, newLines } = mergeEnumValues(mergedEnums[existingIndex], pEnum);\r\n mergedEnums[existingIndex] = mergedBlock;\r\n if (newLines.length > 0) enumDiffs.push(diffPreview(mergedEnums[existingIndex], newLines));\r\n } else {\r\n mergedEnums.push(pEnum);\r\n enumDiffs.push(chalk.green(`+ ${pEnum}`));\r\n }\r\n }\r\n\r\n if (mergedModels.length === appModels.length && mergedEnums.length === appEnums.length) {\r\n console.log(chalk.yellow(\"āš ļø No new models or enums to merge.\\n\"));\r\n process.exit(0);\r\n }\r\n\r\n let mergedContent = appContent.trim();\r\n mergedContent +=\r\n \"\\n\\n// ------------------------------\\n\" +\r\n \"// FlagsForge Schema Extensions\\n\" +\r\n \"// ------------------------------\\n\\n\" +\r\n [...mergedEnums, ...mergedModels].join(\"\\n\\n\");\r\n\r\n // Dry-run preview\r\n if (isDryRun) {\r\n console.log(chalk.gray(\"----- FULL MERGE DIFF -----\\n\"));\r\n [...enumDiffs, ...modelDiffs].forEach(diff => console.log(diff));\r\n console.log(chalk.gray(\"\\n------------------------------\"));\r\n console.log(chalk.cyan(\"\\nāœØ Dry run complete. No changes were made.\\n\"));\r\n process.exit(0);\r\n }\r\n\r\n // Backup prompt\r\n let shouldBackup = true;\r\n if (!isForce) {\r\n const response = await prompts({\r\n type: \"confirm\",\r\n name: \"backup\",\r\n message: \"Create a backup of your current schema?\",\r\n initial: true\r\n });\r\n shouldBackup = response.backup;\r\n }\r\n\r\n if (shouldBackup) {\r\n const timestamp = new Date().toISOString().replace(/[:.]/g, \"-\");\r\n const backupPath = `${appSchema}.bak-${timestamp}`;\r\n fs.copyFileSync(appSchema, backupPath);\r\n console.log(chalk.green(`āœ… Backup created: ${backupPath}\\n`));\r\n }\r\n\r\n fs.writeFileSync(appSchema, mergedContent);\r\n console.log(chalk.green.bold(\"āœ… Prisma schema merged successfully!\"));\r\n console.log(chalk.yellow(\"Run `npx prisma generate` to update your client.\\n\"));\r\n}\r\n\r\nmain().catch(err => {\r\n console.error(chalk.red(\"āŒ Error merging schemas:\"), err);\r\n process.exit(1);\r\n});\r\n"],"mappings":"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","names":["path","chalk","fs","prompts"]}
1
+ {"version":3,"sources":["../../bin/mergeSchema.ts"],"sourcesContent":["#!/usr/bin/env node\r\nimport fs from \"fs\";\r\nimport path from \"path\";\r\nimport chalk from \"chalk\";\r\nimport prompts from \"prompts\";\r\n\r\n// -----------------------------\r\n// CLI Flags\r\n// -----------------------------\r\nconst args = process.argv.slice(2);\r\nconst isDryRun = args.includes(\"--dry-run\");\r\nconst isForce = args.includes(\"--force\");\r\n\r\n// -----------------------------\r\n// Paths\r\n// -----------------------------\r\nconst appSchema = path.resolve(process.cwd(), \"prisma/schema.prisma\");\r\nconst packageSchema = path.resolve(__dirname, \"../../prisma/schema.prisma\");\r\n\r\n// -----------------------------\r\n// Helpers\r\n// -----------------------------\r\nfunction extractBlocks(schema: string, type: \"model\" | \"enum\"): string[] {\r\n const regex = new RegExp(`${type}\\\\s+\\\\w+\\\\s+{[\\\\s\\\\S]*?}\\\\n?`, \"g\");\r\n return schema.match(regex) || [];\r\n}\r\n\r\nfunction extractNames(schema: string, type: \"model\" | \"enum\"): string[] {\r\n const regex = new RegExp(`${type}\\\\s+(\\\\w+)\\\\s+{`, \"g\");\r\n const names: string[] = [];\r\n let match;\r\n while ((match = regex.exec(schema)) !== null) {\r\n names.push(match[1]);\r\n }\r\n return names;\r\n}\r\n\r\nfunction stripNonStructuralBlocks(schema: string) {\r\n return schema\r\n .replace(/generator\\s+\\w+\\s+{[\\s\\S]*?}\\n?/g, \"\")\r\n .replace(/datasource\\s+\\w+\\s+{[\\s\\S]*?}\\n?/g, \"\");\r\n}\r\n\r\n// Returns array of trimmed field lines\r\nfunction parseBlockFields(block: string) {\r\n return block\r\n .split(\"\\n\")\r\n .map(l => l.trim())\r\n .filter(\r\n l =>\r\n l &&\r\n !l.startsWith(\"//\") &&\r\n !l.startsWith(\"model\") &&\r\n !l.startsWith(\"enum\") &&\r\n !l.startsWith(\"{\") &&\r\n !l.startsWith(\"}\")\r\n );\r\n}\r\n\r\n// Merge model fields: updates changed fields, adds new fields\r\nfunction mergeModelFields(existing: string, incoming: string) {\r\n const existingFields = parseBlockFields(existing);\r\n const incomingFields = parseBlockFields(incoming);\r\n\r\n const mergedFields: string[] = [...existingFields];\r\n const newLines: string[] = [];\r\n\r\n const existingMap = new Map(existingFields.map(f => [f.split(\" \")[0], f]));\r\n\r\n for (const line of incomingFields) {\r\n const name = line.split(\" \")[0];\r\n if (!existingMap.has(name)) {\r\n mergedFields.push(line);\r\n newLines.push(`+ ${line}`);\r\n } else if (existingMap.get(name) !== line) {\r\n // Update changed field\r\n const index = mergedFields.findIndex(f => f.split(\" \")[0] === name);\r\n mergedFields[index] = line;\r\n newLines.push(`~ ${line}`);\r\n }\r\n }\r\n\r\n const mergedBlock = existing.replace(/\\{[\\s\\S]*\\}/, `{ \\n ${mergedFields.join(\"\\n \")} \\n}`);\r\n return { mergedBlock, newLines };\r\n}\r\n\r\n// Merge enum values\r\nfunction mergeEnumValues(existing: string, incoming: string) {\r\n const existingValues = parseBlockFields(existing);\r\n const incomingValues = parseBlockFields(incoming);\r\n\r\n const mergedValues = [...existingValues];\r\n const newLines: string[] = [];\r\n\r\n for (const v of incomingValues) {\r\n if (!existingValues.includes(v)) {\r\n mergedValues.push(v);\r\n newLines.push(`+ ${v}`);\r\n }\r\n }\r\n\r\n const mergedBlock = existing.replace(/\\{[\\s\\S]*\\}/, `{ \\n ${mergedValues.join(\"\\n \")} \\n}`);\r\n return { mergedBlock, newLines };\r\n}\r\n\r\n// -----------------------------\r\n// Main\r\n// -----------------------------\r\nasync function main() {\r\n console.log(chalk.blueBright.bold(\"\\nāš” FlagsForge Prisma Schema Smart Merger\\n\"));\r\n\r\n if (isDryRun) console.log(chalk.cyan(\"šŸ” Dry run: preview all changes\\n\"));\r\n if (isForce) console.log(chalk.yellow(\"āš ļø Force mode enabled (skipping backup prompts)\\n\"));\r\n\r\n if (!fs.existsSync(appSchema)) {\r\n console.error(chalk.red(\"āŒ App schema not found at prisma/schema.prisma\"));\r\n process.exit(1);\r\n }\r\n\r\n if (!fs.existsSync(packageSchema)) {\r\n console.error(chalk.red(\"āŒ Package Prisma models not found\"));\r\n process.exit(1);\r\n }\r\n\r\n const appContent = fs.readFileSync(appSchema, \"utf-8\");\r\n const packageRaw = fs.readFileSync(packageSchema, \"utf-8\");\r\n const packageContent = stripNonStructuralBlocks(packageRaw);\r\n\r\n const appModels = extractBlocks(appContent, \"model\");\r\n const appEnums = extractBlocks(appContent, \"enum\");\r\n const packageModels = extractBlocks(packageContent, \"model\");\r\n const packageEnums = extractBlocks(packageContent, \"enum\");\r\n\r\n // Merge models\r\n const mergedModels = [...appModels];\r\n const modelDiffs: string[] = [];\r\n\r\n for (const pModel of packageModels) {\r\n const match = pModel.match(/model\\s+(\\w+)\\s+{/);\r\n if (!match) continue;\r\n const name = match[1];\r\n const existingIndex = mergedModels.findIndex(m => m.match(new RegExp(`model\\\\s+${name}\\\\s+{`)));\r\n if (existingIndex >= 0) {\r\n const { mergedBlock, newLines } = mergeModelFields(mergedModels[existingIndex], pModel);\r\n mergedModels[existingIndex] = mergedBlock;\r\n modelDiffs.push(...newLines);\r\n } else {\r\n mergedModels.push(pModel);\r\n modelDiffs.push(`+ New model: ${name}`);\r\n }\r\n }\r\n\r\n // Merge enums\r\n const mergedEnums = [...appEnums];\r\n const enumDiffs: string[] = [];\r\n\r\n for (const pEnum of packageEnums) {\r\n const match = pEnum.match(/enum\\s+(\\w+)\\s+{/);\r\n if (!match) continue;\r\n const name = match[1];\r\n const existingIndex = mergedEnums.findIndex(e => e.match(new RegExp(`enum\\\\s+${name}\\\\s+{`)));\r\n if (existingIndex >= 0) {\r\n const { mergedBlock, newLines } = mergeEnumValues(mergedEnums[existingIndex], pEnum);\r\n mergedEnums[existingIndex] = mergedBlock;\r\n enumDiffs.push(...newLines);\r\n } else {\r\n mergedEnums.push(pEnum);\r\n enumDiffs.push(`+ New enum: ${name}`);\r\n }\r\n }\r\n\r\n if (modelDiffs.length === 0 && enumDiffs.length === 0) {\r\n console.log(chalk.yellow(\"āš ļø No changes detected.\\n\"));\r\n process.exit(0);\r\n }\r\n\r\n const mergedContent =\r\n appContent.trim() +\r\n \"\\n\\n// ------------------------------\\n\" +\r\n \"// FlagsForge Schema Extensions\\n\" +\r\n \"// ------------------------------\\n\\n\" +\r\n [...mergedEnums, ...mergedModels].join(\"\\n\\n\");\r\n\r\n // Dry-run preview\r\n if (isDryRun) {\r\n console.log(chalk.gray(\"----- FULL MERGE DIFF -----\\n\"));\r\n [...enumDiffs, ...modelDiffs].forEach(line => {\r\n if (line.startsWith(\"+\")) console.log(chalk.green(line));\r\n else if (line.startsWith(\"~\")) console.log(chalk.yellow(line));\r\n else console.log(line);\r\n });\r\n console.log(chalk.gray(\"\\n------------------------------\"));\r\n console.log(chalk.cyan(\"āœØ Dry run complete. No changes were made.\\n\"));\r\n process.exit(0);\r\n }\r\n\r\n // Backup prompt\r\n let shouldBackup = true;\r\n if (!isForce) {\r\n const response = await prompts({\r\n type: \"confirm\",\r\n name: \"backup\",\r\n message: \"Create a backup of your current schema?\",\r\n initial: true\r\n });\r\n shouldBackup = response.backup;\r\n }\r\n\r\n if (shouldBackup) {\r\n const timestamp = new Date().toISOString().replace(/[:.]/g, \"-\");\r\n const backupPath = `${appSchema}.bak-${timestamp}`;\r\n fs.copyFileSync(appSchema, backupPath);\r\n console.log(chalk.green(`āœ… Backup created: ${backupPath}\\n`));\r\n }\r\n\r\n fs.writeFileSync(appSchema, mergedContent);\r\n console.log(chalk.green.bold(\"āœ… Prisma schema merged successfully!\"));\r\n console.log(chalk.yellow(\"Run `npx prisma generate` to update your client.\\n\"));\r\n}\r\n\r\nmain().catch(err => {\r\n console.error(chalk.red(\"āŒ Error merging schemas:\"), err);\r\n process.exit(1);\r\n});\r\n"],"mappings":"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","names":["path","chalk","fs","prompts"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rps-flagforge",
3
- "version": "1.0.8",
3
+ "version": "1.0.9",
4
4
  "description": "A Multi-Core Feature Flag Package with support for React & NodeJS",
5
5
  "main": "dist/index.cjs.js",
6
6
  "module": "dist/index.esm.js",