@baeta/plugin-gitignore 2.0.0-next.3 → 2.0.0-next.8

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @baeta/plugin-gitignore
 
+## 2.0.0-next.8
+
+## 2.0.0-next.7
+
+### Patch Changes
+
+- [#214](https://github.com/andreisergiu98/baeta/pull/214) [`c47665a`](https://github.com/andreisergiu98/baeta/commit/c47665a76a0f88bae07f42983b380361e4f0843a) Thanks [@andreisergiu98](https://github.com/andreisergiu98)! - Fix gitignore plugin not skipping files that are only generated at init
+
 ## 2.0.0-next.3
 
 ### Patch Changes

package/README.md

@@ -5,7 +5,7 @@
 <div align="center">
   <h1>Baeta</h1>
   <a href="https://www.npmjs.com/package/@baeta/cli"><img src="https://img.shields.io/npm/v/@baeta/cli.svg?style=flat" /></a>
-   <a href="https://github.com/andreisergiu98/baeta/actions/workflows/testing.yml"><img src="https://img.shields.io/github/actions/workflow/status/andreisergiu98/baeta/testing.yml" /></a>
+   <a href="https://github.com/andreisergiu98/baeta/actions/workflows/checks.yml"><img src="https://img.shields.io/github/actions/workflow/status/andreisergiu98/baeta/checks.yml" /></a>
   <a href="https://github.com/andreisergiu98/baeta/pulls"><img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" /></a>
   <a href="https://github.com/andreisergiu98/baeta/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue" /></a>
   <br />
@@ -103,7 +103,7 @@ import { UserModule } from "./typedef.ts";
 const { Query } = UserModule;
 
 const userQuery = Query.user
-  .auth({
+  .$auth({
     $or: {
       isPublic: true,
       isLoggedIn: true,
@@ -122,16 +122,16 @@ const { Query, Mutation, User } = UserModule;
 export const userCache = User.$createCache();
 
 const userQuery = Query.user
-  .auth({
+  .$auth({
     // ...
   })
-  .useCache(userCache)
+  .$useCache(userCache)
   .resolve(async ({ args }) => {
     // ...
   });
 
 const updateUserMutation = Mutation.updateUser
-  .use(async (next) => {
+  .$use(async (next) => {
     const user = await next();
     await userCache.save(user);
     return user;

package/dist/index.d.ts

@@ -10,10 +10,14 @@ interface GitignoreOptions {
    * File tags are identifiers assigned to generated files
    * to categorize them by their plugin or purpose.
    */
-  ignoreTags?: string[];
+  skipTags?: string[];
+  /**
+   * Array of files to exclude from .gitignore.
+   */
+  skipFilesGlobs?: string[];
 }
 interface GitignoreOptions {
-  ignoreTags?: string[];
+  skipTags?: string[];
 }
 /**
  * A plugin that adds .gitignore entries for generated files.

package/dist/index.js

@@ -1,8 +1,8 @@
 import { relative, resolve } from "node:path";
-import { FileBlock, createPluginV1 } from "@baeta/generator-sdk";
+import { FileBlock, createPluginV1, micromatch } from "@baeta/generator-sdk";
 
 //#region index.ts
-const defaultIgnoredTags = ["cloudflare"];
+const defaultSkipTags = ["cloudflare"];
 /**
 * A plugin that adds .gitignore entries for generated files.
 *
@@ -15,13 +15,14 @@ function gitignorePlugin(options) {
 		actionName: "add  generated files to .gitignore",
 		generate: async (ctx, next) => {
 			await next();
-			const ignoredTags = [...options?.ignoreTags ?? [], ...defaultIgnoredTags];
 			const modulesDir = ctx.generatorOptions.modulesDir;
 			const moduleDefinitionName = ctx.generatorOptions.moduleDefinitionName;
+			const skipedTags = new Set([...options?.skipTags ?? [], ...defaultSkipTags]);
+			const skippedFilesGlobs = [...(options?.skipFilesGlobs ?? []).map((glob) => resolve(ctx.generatorOptions.cwd, glob))];
 			const generatedPaths = ctx.fileManager.files.filter((file$1) => {
-				return !file$1.filename.endsWith(moduleDefinitionName) && !ignoredTags.includes(file$1.tag);
+				return !file$1.filename.endsWith(moduleDefinitionName) && !skipedTags.has(file$1.tag) && !skippedFilesGlobs.some((skippedFile) => micromatch.isMatch(file$1.filename, skippedFile)) && file$1.options?.disableOverwrite !== true;
 			}).map((file$1) => file$1.filename).map((file$1) => relative(ctx.generatorOptions.cwd, file$1)).filter((file$1) => !file$1.endsWith(moduleDefinitionName));
-			generatedPaths.push(`${relative(ctx.generatorOptions.cwd, modulesDir)}/**/${moduleDefinitionName}`);
+			if (!skippedFilesGlobs.some((skippedFile) => micromatch.isMatch(`${modulesDir}/**/${moduleDefinitionName}`, skippedFile))) generatedPaths.push(`${relative(ctx.generatorOptions.cwd, modulesDir)}/**/${moduleDefinitionName}`);
 			generatedPaths.sort((a, b) => a.localeCompare(b));
 			const gitignoreStart = "# Generated by Baeta - Begin";
 			const gitignoreInner = generatedPaths.join("\n");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["file"],"sources":["../index.ts"],"sourcesContent":["import { relative, resolve } from 'node:path';\nimport { createPluginV1, FileBlock } from '@baeta/generator-sdk';\n\n/**\n * Configuration options for the gitignore plugin.\n */\nexport interface GitignoreOptions {\n\t/**\n\t * Array of file tags to exclude from .gitignore.\n\t * File tags are identifiers assigned to generated files\n\t * to categorize them by their plugin or purpose.\n\t */\n\tignoreTags?: string[];\n}\nexport interface GitignoreOptions {\n\tignoreTags?: string[];\n}\n\nconst defaultIgnoredTags = ['cloudflare'];\n\n/**\n * A plugin that adds .gitignore entries for generated files.\n *\n * @param options - Plugin configuration options\n * @returns A Baeta generator plugin\n */\nexport function gitignorePlugin(options?: GitignoreOptions) {\n\treturn createPluginV1({\n\t\tname: 'gitignore-plugin',\n\t\tactionName: 'add  generated files to .gitignore',\n\t\tgenerate: async (ctx, next) => {\n\t\t\tawait next();\n\n\t\t\tconst ignoredTags = [...(options?.ignoreTags ?? []), ...defaultIgnoredTags];\n\n\t\t\tconst modulesDir = ctx.generatorOptions.modulesDir;\n\t\t\tconst moduleDefinitionName = ctx.generatorOptions.moduleDefinitionName;\n\n\t\t\tconst filePaths = ctx.fileManager.files\n\t\t\t\t.filter((file) => {\n\t\t\t\t\treturn !file.filename.endsWith(moduleDefinitionName) && !ignoredTags.includes(file.tag);\n\t\t\t\t})\n\t\t\t\t.map((file) => file.filename);\n\n\t\t\tconst generatedPaths = filePaths\n\t\t\t\t.map((file) => relative(ctx.generatorOptions.cwd, file))\n\t\t\t\t.filter((file) => !file.endsWith(moduleDefinitionName));\n\n\t\t\tgeneratedPaths.push(\n\t\t\t\t`${relative(ctx.generatorOptions.cwd, modulesDir)}/**/${moduleDefinitionName}`,\n\t\t\t);\n\n\t\t\tgeneratedPaths.sort((a, b) => a.localeCompare(b));\n\n\t\t\tconst gitignoreStart = '# Generated by Baeta - Begin';\n\t\t\tconst gitignoreInner = generatedPaths.join('\\n');\n\t\t\tconst gitignoreEnd = '# Generated by Baeta - End';\n\n\t\t\tconst file = new FileBlock(\n\t\t\t\tresolve(ctx.generatorOptions.cwd, '.gitignore'),\n\t\t\t\tgitignoreInner,\n\t\t\t\tgitignoreStart,\n\t\t\t\tgitignoreEnd,\n\t\t\t\t'gitignore',\n\t\t\t);\n\n\t\t\tctx.fileManager.add(file);\n\t\t},\n\t});\n}\n"],"mappings":";;;;AAkBA,MAAM,qBAAqB,CAAC,aAAa;;;;;;;AAQzC,SAAgB,gBAAgB,SAA4B;AAC3D,QAAO,eAAe;EACrB,MAAM;EACN,YAAY;EACZ,UAAU,OAAO,KAAK,SAAS;AAC9B,SAAM,MAAM;GAEZ,MAAM,cAAc,CAAC,GAAI,SAAS,cAAc,EAAE,EAAG,GAAG,mBAAmB;GAE3E,MAAM,aAAa,IAAI,iBAAiB;GACxC,MAAM,uBAAuB,IAAI,iBAAiB;GAQlD,MAAM,iBANY,IAAI,YAAY,MAChC,QAAQ,WAAS;AACjB,WAAO,CAACA,OAAK,SAAS,SAAS,qBAAqB,IAAI,CAAC,YAAY,SAASA,OAAK,IAAI;KACtF,CACD,KAAK,WAASA,OAAK,SAAS,CAG5B,KAAK,WAAS,SAAS,IAAI,iBAAiB,KAAKA,OAAK,CAAC,CACvD,QAAQ,WAAS,CAACA,OAAK,SAAS,qBAAqB,CAAC;AAExD,kBAAe,KACd,GAAG,SAAS,IAAI,iBAAiB,KAAK,WAAW,CAAC,MAAM,uBACxD;AAED,kBAAe,MAAM,GAAG,MAAM,EAAE,cAAc,EAAE,CAAC;GAEjD,MAAM,iBAAiB;GACvB,MAAM,iBAAiB,eAAe,KAAK,KAAK;GAGhD,MAAM,OAAO,IAAI,UAChB,QAAQ,IAAI,iBAAiB,KAAK,aAAa,EAC/C,gBACA,gBALoB,8BAOpB,YACA;AAED,OAAI,YAAY,IAAI,KAAK;;EAE1B,CAAC"}
+{"version":3,"file":"index.js","names":["file"],"sources":["../index.ts"],"sourcesContent":["import { relative, resolve } from 'node:path';\nimport { createPluginV1, FileBlock, micromatch } from '@baeta/generator-sdk';\n\n/**\n * Configuration options for the gitignore plugin.\n */\nexport interface GitignoreOptions {\n\t/**\n\t * Array of file tags to exclude from .gitignore.\n\t * File tags are identifiers assigned to generated files\n\t * to categorize them by their plugin or purpose.\n\t */\n\tskipTags?: string[];\n\n\t/**\n\t * Array of files to exclude from .gitignore.\n\t */\n\tskipFilesGlobs?: string[];\n}\nexport interface GitignoreOptions {\n\tskipTags?: string[];\n}\n\nconst defaultSkipTags = ['cloudflare'];\n\n/**\n * A plugin that adds .gitignore entries for generated files.\n *\n * @param options - Plugin configuration options\n * @returns A Baeta generator plugin\n */\nexport function gitignorePlugin(options?: GitignoreOptions) {\n\treturn createPluginV1({\n\t\tname: 'gitignore-plugin',\n\t\tactionName: 'add  generated files to .gitignore',\n\t\tgenerate: async (ctx, next) => {\n\t\t\tawait next();\n\n\t\t\tconst modulesDir = ctx.generatorOptions.modulesDir;\n\t\t\tconst moduleDefinitionName = ctx.generatorOptions.moduleDefinitionName;\n\n\t\t\tconst skipedTags = new Set([...(options?.skipTags ?? []), ...defaultSkipTags]);\n\t\t\tconst skippedFilesGlobs = [\n\t\t\t\t...(options?.skipFilesGlobs ?? []).map((glob) => resolve(ctx.generatorOptions.cwd, glob)),\n\t\t\t];\n\n\t\t\tconst filePaths = ctx.fileManager.files\n\t\t\t\t.filter((file) => {\n\t\t\t\t\treturn (\n\t\t\t\t\t\t!file.filename.endsWith(moduleDefinitionName) &&\n\t\t\t\t\t\t!skipedTags.has(file.tag) &&\n\t\t\t\t\t\t!skippedFilesGlobs.some((skippedFile) =>\n\t\t\t\t\t\t\tmicromatch.isMatch(file.filename, skippedFile),\n\t\t\t\t\t\t) &&\n\t\t\t\t\t\tfile.options?.disableOverwrite !== true\n\t\t\t\t\t);\n\t\t\t\t})\n\t\t\t\t.map((file) => file.filename);\n\n\t\t\tconst generatedPaths = filePaths\n\t\t\t\t.map((file) => relative(ctx.generatorOptions.cwd, file))\n\t\t\t\t.filter((file) => !file.endsWith(moduleDefinitionName));\n\n\t\t\tif (\n\t\t\t\t!skippedFilesGlobs.some((skippedFile) =>\n\t\t\t\t\tmicromatch.isMatch(`${modulesDir}/**/${moduleDefinitionName}`, skippedFile),\n\t\t\t\t)\n\t\t\t) {\n\t\t\t\tgeneratedPaths.push(\n\t\t\t\t\t`${relative(ctx.generatorOptions.cwd, modulesDir)}/**/${moduleDefinitionName}`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tgeneratedPaths.sort((a, b) => a.localeCompare(b));\n\n\t\t\tconst gitignoreStart = '# Generated by Baeta - Begin';\n\t\t\tconst gitignoreInner = generatedPaths.join('\\n');\n\t\t\tconst gitignoreEnd = '# Generated by Baeta - End';\n\n\t\t\tconst file = new FileBlock(\n\t\t\t\tresolve(ctx.generatorOptions.cwd, '.gitignore'),\n\t\t\t\tgitignoreInner,\n\t\t\t\tgitignoreStart,\n\t\t\t\tgitignoreEnd,\n\t\t\t\t'gitignore',\n\t\t\t);\n\n\t\t\tctx.fileManager.add(file);\n\t\t},\n\t});\n}\n"],"mappings":";;;;AAuBA,MAAM,kBAAkB,CAAC,aAAa;;;;;;;AAQtC,SAAgB,gBAAgB,SAA4B;AAC3D,QAAO,eAAe;EACrB,MAAM;EACN,YAAY;EACZ,UAAU,OAAO,KAAK,SAAS;AAC9B,SAAM,MAAM;GAEZ,MAAM,aAAa,IAAI,iBAAiB;GACxC,MAAM,uBAAuB,IAAI,iBAAiB;GAElD,MAAM,aAAa,IAAI,IAAI,CAAC,GAAI,SAAS,YAAY,EAAE,EAAG,GAAG,gBAAgB,CAAC;GAC9E,MAAM,oBAAoB,CACzB,IAAI,SAAS,kBAAkB,EAAE,EAAE,KAAK,SAAS,QAAQ,IAAI,iBAAiB,KAAK,KAAK,CAAC,CACzF;GAeD,MAAM,iBAbY,IAAI,YAAY,MAChC,QAAQ,WAAS;AACjB,WACC,CAACA,OAAK,SAAS,SAAS,qBAAqB,IAC7C,CAAC,WAAW,IAAIA,OAAK,IAAI,IACzB,CAAC,kBAAkB,MAAM,gBACxB,WAAW,QAAQA,OAAK,UAAU,YAAY,CAC9C,IACDA,OAAK,SAAS,qBAAqB;KAEnC,CACD,KAAK,WAASA,OAAK,SAAS,CAG5B,KAAK,WAAS,SAAS,IAAI,iBAAiB,KAAKA,OAAK,CAAC,CACvD,QAAQ,WAAS,CAACA,OAAK,SAAS,qBAAqB,CAAC;AAExD,OACC,CAAC,kBAAkB,MAAM,gBACxB,WAAW,QAAQ,GAAG,WAAW,MAAM,wBAAwB,YAAY,CAC3E,CAED,gBAAe,KACd,GAAG,SAAS,IAAI,iBAAiB,KAAK,WAAW,CAAC,MAAM,uBACxD;AAGF,kBAAe,MAAM,GAAG,MAAM,EAAE,cAAc,EAAE,CAAC;GAEjD,MAAM,iBAAiB;GACvB,MAAM,iBAAiB,eAAe,KAAK,KAAK;GAGhD,MAAM,OAAO,IAAI,UAChB,QAAQ,IAAI,iBAAiB,KAAK,aAAa,EAC/C,gBACA,gBALoB,8BAOpB,YACA;AAED,OAAI,YAAY,IAAI,KAAK;;EAE1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baeta/plugin-gitignore",
-  "version": "2.0.0-next.3",
+  "version": "2.0.0-next.8",
   "keywords": [
     "baeta",
     "graphql",
@@ -40,15 +40,23 @@
     "build": "builder build",
     "prepack": "builder prepare",
     "postpack": "builder prepare --clean",
+    "test": "builder test",
+    "test:circular": "builder test-circular",
     "types": "tsc --noEmit"
   },
+  "ava": {
+    "extensions": {
+      "ts": "module"
+    }
+  },
   "dependencies": {
     "@baeta/generator-sdk": "^2.0.0-next.3"
   },
   "devDependencies": {
     "@baeta/builder": "^0.0.0",
+    "@baeta/testing": "^0.0.0",
     "@baeta/tsconfig": "^0.0.0",
-    "@types/node": "^22.18.13",
+    "@types/node": "^22.19.1",
     "typescript": "^5.9.3"
   },
   "engines": {