@ggdna/dna-gg 0.1.1 → 0.2.0

package/README.md

@@ -27,14 +27,25 @@ publish.
 - `dna/dot-github/workflows/quick_check.yaml` — the quick check pipeline
   every pull request has to pass
 
+## Scripts
+
+- `dna/scripts/delete-feature-branch.js` — the one script this layer calls
+  itself, from `/cleanup`, with the two functions it imports:
+  `dna/scripts/functions/colors.js` and
+  `dna/scripts/functions/run-command.js`
+
+These three files are byte-identical copies of their originals in
+[dna_scripts](https://github.com/ggdna/dna_scripts). They are duplicated
+on purpose so that this layer does not drag the whole script set into
+every repo that only wants the gg workflow. A repo that wants the full
+set lists `dna_scripts` as a layer of its own — the copies are identical,
+so both layers together produce exactly the same files.
+
 ## Layers
 
 Builds on [dna_install](https://github.com/ggdna/dna_install) for the
-install overview, [dna_index](https://github.com/ggdna/dna_index) for the
-repo index every gg repo keeps, and
-[dna_scripts](https://github.com/ggdna/dna_scripts) for
-`setup-github-repo.js`, `rename-class.js`, `wait-for-pr.js` and
-`delete-feature-branch.js`, which the guides above call.
+install overview and [dna_index](https://github.com/ggdna/dna_index) for
+the repo index every gg repo keeps.
 
 It extends the `@tooling` section of the install overview through
 `dna/doc/guides/install-guide.overrides.md`: it adds `Install gg` and

package/dna/_dna.json

@@ -5,7 +5,12 @@
 
   // The parent DNAs. dna_install brings the install overview this layer
   // extends with the gg install guides, dna_index the index conventions
-  // every gg repo follows, dna_scripts the node scripts this layer's
-  // guides call. Parents first, this layer wins.
-  "layers": ["dna_install", "dna_index", "dna_scripts"]
+  // every gg repo follows. Parents first, this layer wins.
+  //
+  // dna_scripts is deliberately not a parent: this layer calls exactly one
+  // of its scripts — `delete-feature-branch.js` from the /cleanup skill —
+  // and carries its own copy of it under dna/scripts/ instead. A consumer
+  // that wants the full script set lists dna_scripts itself; the copies
+  // here are byte-identical, so having both layers changes nothing.
+  "layers": ["dna_install", "dna_index"]
 }

package/dna/_generated.json

@@ -5,7 +5,7 @@
       "name": "base",
       "package": "helix",
       "ecosystem": null,
-      "resolvedVersion": "1.0.1",
+      "resolvedVersion": "1.3.1",
       "via": null,
       "hash": "0x705e486e88a93125"
     },
@@ -25,27 +25,19 @@
       "via": null,
       "hash": "0x1d92b0add37a1ac7"
     },
-    {
-      "name": "dna-scripts",
-      "package": "@ggdna/dna-scripts",
-      "ecosystem": "node",
-      "resolvedVersion": "0.1.0",
-      "via": null,
-      "hash": "0x9ee08ef13ab4c8d3"
-    },
     {
       "name": "self",
       "package": null,
       "ecosystem": null,
       "resolvedVersion": null,
       "via": null,
-      "hash": "0xb7b292a1a91dd05f"
+      "hash": "0x97c559b0151610d4"
     }
   ],
   "claude": {
     "claudeMdInclude": null
   },
-  "baseVersion": "1.0.1",
+  "baseVersion": "1.3.1",
   "baseHash": "0x705e486e88a93125",
   "instances": [
     {
@@ -72,17 +64,13 @@
       "path": ".claude/skills/push/SKILL.md",
       "hash": "0x76c357ca9933317d"
     },
-    {
-      "path": ".claude/skills/scripts/SKILL.md",
-      "hash": "0xa12593aa0af31ed2"
-    },
     {
       "path": ".claude/skills/ticket/SKILL.md",
       "hash": "0xbc13efe6fa9af962"
     },
     {
       "path": ".github/workflows/quick_check.yaml",
-      "hash": "0xa61b5062f48e430c"
+      "hash": "0xf3320fb8f530a565"
     },
     {
       "path": "doc/guides/develop-guide.md",
@@ -148,10 +136,6 @@
       "path": "doc/guides/install-guide/install-vscode-guide.md",
       "hash": "0xa0da6a6877bb94c2"
     },
-    {
-      "path": "doc/guides/scripts-guide.md",
-      "hash": "0x426857c389049083"
-    },
     {
       "path": "doc/hello_world.md",
       "hash": "0x0903f7fc5224f6f1"
@@ -168,53 +152,9 @@
       "path": "scripts/functions/colors.js",
       "hash": "0xdfd97f3804665811"
     },
-    {
-      "path": "scripts/functions/current-branch.js",
-      "hash": "0xb9ebbadf45893278"
-    },
-    {
-      "path": "scripts/functions/directories.js",
-      "hash": "0x148d4ebb8aa75523"
-    },
-    {
-      "path": "scripts/functions/get-repo-urls.js",
-      "hash": "0x4c7b3897973acec3"
-    },
-    {
-      "path": "scripts/functions/get-version.js",
-      "hash": "0xfe46316558755cf2"
-    },
-    {
-      "path": "scripts/functions/is-clean-repo.js",
-      "hash": "0x8aa95ca51d9d6517"
-    },
-    {
-      "path": "scripts/functions/is-main-up-to-date.js",
-      "hash": "0xe1ab1826d0ddd039"
-    },
-    {
-      "path": "scripts/functions/pull-request-url.js",
-      "hash": "0x5398755a61a59928"
-    },
     {
       "path": "scripts/functions/run-command.js",
       "hash": "0x085b390fcb9256ab"
-    },
-    {
-      "path": "scripts/functions/sync-folders.js",
-      "hash": "0x4f83165fd92ec49d"
-    },
-    {
-      "path": "scripts/rename-class.js",
-      "hash": "0xa9daec4f3ea514b7"
-    },
-    {
-      "path": "scripts/setup-github-repo.js",
-      "hash": "0x5907588070a580ca"
-    },
-    {
-      "path": "scripts/wait-for-pr.js",
-      "hash": "0x1360c661984b78a8"
     }
   ]
 }

package/dna/dot-github/workflows/quick_check.yaml

@@ -1,4 +1,4 @@
-# Runs the gg-js quick check on every push and pull request against main.
+# Runs the gg quick check on every push and pull request against main.
 
 name: Tests
 
@@ -17,4 +17,4 @@ jobs:
       - uses: actions/checkout@v5
 
       # Uses the Node.js preinstalled on the runner image.
-      - run: npx @tssuite/gg-js one did commit
+      - run: npx @tssuite/ggwsm one did commit

package/dna/scripts/delete-feature-branch.js

@@ -0,0 +1,97 @@
+/**
+ * @license
+ * Copyright (c) dnaCopyrightHolder
+ *
+ * Use of this source code is governed by terms that can be
+ * found in the LICENSE file in the root of this package.
+ */
+
+import { gray, green, red, yellow } from './functions/colors.js';
+import { runCommand } from './functions/run-command.js';
+
+// Check for uncommitted changes
+function hasUncommittedChanges() {
+  console.log(gray('Check for uncommitted changes'));
+  const status = runCommand('git status --porcelain');
+  return status.length > 0;
+}
+
+// Check for unpushed commits
+function hasUnpushedCommits(branch) {
+  try {
+    console.log(gray('Check for unpushed commits'));
+    runCommand(`git rev-parse --abbrev-ref ${branch}@{u}`);
+    const ahead = runCommand(`git rev-list --count ${branch}@{u}..${branch}`);
+    return parseInt(ahead, 10) > 0;
+  } catch {
+    return true;
+  }
+}
+
+// Try a test merge into main and check if it introduces changes
+function isBranchEffectivelyMerged(featureBranch) {
+  console.log(gray('Check if feature was fully merged'));
+
+  try {
+    runCommand(`git merge --no-commit --no-ff ${featureBranch}`);
+    const changed = hasUncommittedChanges();
+    runCommand('git merge --abort');
+    return !changed;
+  } catch {
+    try {
+      runCommand('git merge --abort');
+    } catch {}
+    return false;
+  }
+}
+
+try {
+  console.log(gray('Get current branch name'));
+  const currentBranch = runCommand('git rev-parse --abbrev-ref HEAD');
+
+  if (currentBranch === 'main') {
+    console.log(yellow('Please call this script from a feature branch.'));
+    process.exit(0);
+  }
+
+  if (hasUncommittedChanges()) {
+    console.error(red('❌ You have uncommitted changes.'));
+    console.error(
+      yellow('Please commit or stash your changes before continuing.'),
+    );
+    process.exit(1);
+  }
+
+  if (hasUnpushedCommits(currentBranch)) {
+    console.error(red('❌ You have unpushed commits.'));
+    console.error(yellow('Please push your branch before continuing.'));
+    process.exit(1);
+  }
+
+  console.log(gray(`Fetching and pulling 'main'...`));
+  runCommand('git fetch');
+  runCommand('git checkout main');
+  runCommand('git pull origin main');
+
+  const isMerged = isBranchEffectivelyMerged(currentBranch);
+
+  if (isMerged) {
+    runCommand(`git branch -d ${currentBranch}`);
+    console.log(green(`✅ Branch '${currentBranch}' has been deleted.`));
+  } else {
+    console.error(
+      red(`❌ Branch '${currentBranch}' is not merged into 'main'.`),
+    );
+    console.log(
+      yellow(`Please (create and) merge a pull request and try again.`),
+    );
+    runCommand(`git checkout ${currentBranch}`);
+    console.log(gray(`Switched back to '${currentBranch}'.`));
+  }
+} catch (error) {
+  console.error(red(`Error: ${error.message}`));
+  try {
+    runCommand('git merge --abort');
+  } catch {}
+  process.exit(1);
+}

package/dna/scripts/functions/colors.js

@@ -0,0 +1,27 @@
+/**
+ * @license
+ * Copyright (c) dnaCopyrightHolder
+ *
+ * Use of this source code is governed by terms that can be
+ * found in the LICENSE file in the root of this package.
+ */
+
+export const red = (str) => `\x1b[31m${str}\x1b[0m`;
+export const green = (str) => `\x1b[32m${str}\x1b[0m`;
+export const yellow = (str) => `\x1b[33m${str}\x1b[0m`;
+export const blue = (str) => `\x1b[34m${str}\x1b[0m`;
+export const magenta = (str) => `\x1b[35m${str}\x1b[0m`;
+export const cyan = (str) => `\x1b[36m${str}\x1b[0m`;
+export const white = (str) => `\x1b[37m${str}\x1b[0m`;
+export const black = (str) => `\x1b[30m${str}\x1b[0m`;
+export const bgRed = (str) => `\x1b[41m${str}\x1b[0m`;
+export const bgGreen = (str) => `\x1b[42m${str}\x1b[0m`;
+export const bgYellow = (str) => `\x1b[43m${str}\x1b[0m`;
+export const bgBlue = (str) => `\x1b[44m${str}\x1b[0m`;
+export const bgMagenta = (str) => `\x1b[45m${str}\x1b[0m`;
+export const bgCyan = (str) => `\x1b[46m${str}\x1b[0m`;
+export const bgWhite = (str) => `\x1b[47m${str}\x1b[0m`;
+export const bgBlack = (str) => `\x1b[40m${str}\x1b[0m`;
+export const gray = (str) => `\x1b[90m${str}\x1b[0m`;
+export const lightGray = (str) => `\x1b[37m${str}\x1b[0m`;
+export const reset = (str) => `\x1b[0m${str}\x1b[0m`;

package/dna/scripts/functions/run-command.js

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright (c) dnaCopyrightHolder
+ *
+ * Use of this source code is governed by terms that can be
+ * found in the LICENSE file in the root of this package.
+ */
+
+import { execSync } from 'child_process';
+import { gray } from './colors.js';
+
+// Execute a shell command and return trimmed output
+// Execute a shell command and return trimmed output
+export function runCommand(command, silent = true, logCommand = true) {
+  if (logCommand) {
+    console.log(gray(`${command}`));
+  }
+  return execSync(command, {
+    encoding: 'utf-8',
+    stdio: silent ? ['pipe', 'pipe', 'pipe'] : undefined,
+  }).trim();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ggdna/dna-gg",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "DNA layer: gg CLI workflow guides, repo setup scripts and CI check",
   "keywords": [
     "dna",
@@ -29,18 +29,16 @@
   },
   "dependencies": {
     "@ggdna/dna-index": "^0.1.0",
-    "@ggdna/dna-install": "^0.1.0",
-    "@ggdna/dna-scripts": "^0.1.0"
+    "@ggdna/dna-install": "^0.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^26.4.1",
+    "prettier": "^3.9.6"
   },
   "scripts": {
     "test:dart": "dart test",
     "test": "pnpm run test:dart",
-    "prepublishOnly": "pnpm run test",
     "format": "prettier --write .",
     "format:check": "prettier --check ."
-  },
-  "devDependencies": {
-    "@types/node": "^26.2.0",
-    "prettier": "^3.9.6"
   }
-}
+}