@peterseibel/hug 0.1.9 → 0.1.11

package/DEVELOPMENT.md

@@ -66,8 +66,11 @@ npm version patch   # or minor / major
 git push --follow-tags
 ```
 
-`npm version` bumps `package.json`, commits, and creates a `v*` tag. Pushing
-the tag triggers the workflow in `.github/workflows/publish.yml`.
+`npm version` bumps `package.json`, commits, and creates a `v*` tag. Pushing the
+tag triggers the workflow in `.github/workflows/publish.yml`. (You can also use
+`git config push.followTags true` to configure the repo to always push tags and
+then `npm version patch && git push` will do the trick.)
+
 
 ## Dependencies
 

package/README.md

@@ -54,6 +54,47 @@ hug fork
 
 Creates a new Apps Script project from the current local code. Useful with git branches — fork on a branch to get a separate Apps Script project you can develop against independently. If you're using `hug config` to manage resources like spreadsheet IDs, you'll probably want to update them after forking so the new project points at its own resources.
 
+#### Forking a container-bound project
+
+If your project is a container-bound script (created via Extensions > Apps Script inside a Google Sheet, Doc, etc.), `hug fork` will refuse by default since the forked standalone copy can't call `getActiveSpreadsheet()` and similar container APIs.
+
+Use `--detach` to fork anyway and automatically save the original container's ID to `config.js`:
+
+```bash
+hug fork --detach
+```
+
+This sets `CONTAINER_ID` in `config.js` to the original container's ID. You'll then need to update your code to open the container explicitly instead of relying on the bound context. For example:
+
+```javascript
+// Before (container-bound only)
+const ss = SpreadsheetApp.getActiveSpreadsheet();
+const sheet = SpreadsheetApp.getActiveSheet();
+const range = SpreadsheetApp.getActiveRange();
+
+// After (works in standalone fork)
+const ss = SpreadsheetApp.openById(CONFIG.CONTAINER_ID);
+const sheet = ss.getActiveSheet();         // or ss.getSheetByName("Sheet1")
+const range = sheet.getActiveRange();      // or sheet.getRange(...)
+```
+
+Similarly for other container types:
+
+```javascript
+// Google Doc
+const doc = DocumentApp.openById(CONFIG.CONTAINER_ID);
+
+// Google Form
+const form = FormApp.openById(CONFIG.CONTAINER_ID);
+```
+
+After updating the code, push it and optionally set up a fresh deployment:
+
+```bash
+hug push
+hug deploy "detach from container"
+```
+
 ### Configure
 
 ```bash
@@ -116,5 +157,6 @@ git switch -c staging
 hug fork                              # new Apps Script project, updates .clasp.json
 hug config set SPREADSHEET_ID=1Bx..   # point at a staging spreadsheet
 hug deploy                            # deploys to the staging project
+git commit                            # Commit work in branch.
 git switch main                       # .clasp.json and config.js switch back to production
 ```

package/bin/hug

@@ -22,7 +22,7 @@ Usage: hug <command> [options]
 Project commands:
   init [--template blank|webapp] [name]   Create a new project from a template
   init --scriptId <id> [name]             Import an existing Apps Script project
-  fork                                    Create a new Apps Script project from current code
+  fork [--detach]                          Create a new Apps Script project from current code
 
 Development commands:
   push                Push local files to Apps Script
@@ -98,6 +98,7 @@ cmd_init() {
     # Import mode: clone an existing project
     echo "Importing project $script_id..."
     run_clasp "$clasp" clone "$script_id"
+    patch_parent_id
 
     echo ""
     echo "Project imported. Next steps:"
@@ -139,16 +140,23 @@ cmd_init() {
 
 cmd_fork() {
   local force=false
+  local detach=false
   while [ $# -gt 0 ]; do
     case "$1" in
       -f|--force) force=true; shift ;;
+      --detach) detach=true; shift ;;
       --help)
-        echo "Usage: hug fork [-f|--force]"
+        echo "Usage: hug fork [-f|--force] [--detach]"
         echo ""
         echo "Creates a new Apps Script project from the current local code."
         echo "Replaces .clasp.json with a new project, then pushes code to it."
         echo ""
-        echo "Refuses if the current project is container-bound (use -f to override)."
+        echo "Refuses if the current project is container-bound (use -f to override,"
+        echo "or --detach to fork and save the container ID to config)."
+        echo ""
+        echo "  --detach   Fork a container-bound project and set CONTAINER_ID in"
+        echo "             config.js to the original container's ID, so code can"
+        echo "             open it via SpreadsheetApp.openById() etc."
         echo ""
         echo "Useful with git branches: fork on a branch to get a separate"
         echo "Apps Script project for each branch."
@@ -162,16 +170,21 @@ cmd_fork() {
     return 1
   fi
 
-  if [ "$force" = false ] && grep -q '"parentId"' .clasp.json 2>/dev/null; then
-    local parent_id
+  # Capture parentId before we replace .clasp.json
+  local parent_id=""
+  if grep -q '"parentId"' .clasp.json 2>/dev/null; then
     parent_id=$(grep '"parentId"' .clasp.json | sed 's/.*"parentId"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/')
+  fi
+
+  if [ -n "$parent_id" ] && [ "$force" = false ] && [ "$detach" = false ]; then
     echo "Error: this is a container-bound script. Forking will create a standalone" >&2
     echo "project, but the code may depend on its container (e.g. by calling." >&2
     echo "getActiveSpreadsheet())." >&2
     echo "" >&2
     echo "Container: https://drive.google.com/file/d/$parent_id" >&2
     echo "" >&2
-    echo "Use 'hug fork --force' to fork anyway." >&2
+    echo "Use 'hug fork --force' to fork anyway, or '--detach' to fork and" >&2
+    echo "save the container ID to config.js as CONTAINER_ID." >&2
     return 1
   fi
 
@@ -183,10 +196,30 @@ cmd_fork() {
 
   echo "Creating new Apps Script project '$title'..."
   rm -f .clasp.json
+  # Preserve appsscript.json because clasp create overwrites it with server defaults
+  local saved_manifest=""
+  if [ -f appsscript.json ]; then
+    saved_manifest=$(cat appsscript.json)
+  fi
   run_clasp "$clasp" create --type standalone --title "$title"
+  if [ -n "$saved_manifest" ]; then
+    echo "$saved_manifest" > appsscript.json
+  fi
 
   echo "Pushing code to new project..."
-  run_clasp "$clasp" push
+  run_clasp "$clasp" push --force
+
+  # If detaching, save the original container ID to config
+  if [ "$detach" = true ] && [ -n "$parent_id" ]; then
+    local existing=""
+    if [ -f config.js ]; then
+      existing=$(_read_config)
+    fi
+    existing=$(echo "$existing" | grep -v "^CONTAINER_ID=" || true)
+    { printf '%s\nCONTAINER_ID=%s\n' "$existing" "$parent_id" | grep -v '^$' || true; } | _write_config
+    echo "Set CONTAINER_ID=$parent_id in config.js."
+    echo "Push will include config.js. Use SpreadsheetApp.openById(CONFIG.CONTAINER_ID) etc."
+  fi
 
   echo ""
   echo "Fork complete. This directory now points to a new Apps Script project."

package/lib/common.sh

@@ -43,6 +43,41 @@ run_clasp() {
   return $exit_code
 }
 
+# If the project is container-bound, patch parentId into .clasp.json
+patch_parent_id() {
+  local script_id
+  script_id=$(grep '"scriptId"' .clasp.json | sed 's/.*"scriptId"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/')
+  if [ -z "$script_id" ]; then
+    return
+  fi
+
+  local token
+  token=$(sed -n 's/.*"access_token"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p' ~/.clasprc.json 2>/dev/null)
+  if [ -z "$token" ]; then
+    return
+  fi
+
+  local response
+  response=$(curl -sf -H "Authorization: Bearer $token" \
+    "https://script.googleapis.com/v1/projects/$script_id" 2>/dev/null) || return 0
+
+  local parent_id
+  parent_id=$(echo "$response" | sed -n 's/.*"parentId"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/p')
+  if [ -z "$parent_id" ]; then
+    return
+  fi
+
+  # Already has parentId
+  if grep -q '"parentId"' .clasp.json 2>/dev/null; then
+    return
+  fi
+
+  # Inject parentId into .clasp.json before the closing brace
+  local tmp
+  tmp=$(mktemp)
+  sed '$s/}$/,"parentId":"'"$parent_id"'"}/' .clasp.json > "$tmp" && mv "$tmp" .clasp.json
+}
+
 # Resolve the hug package root (where templates/ lives)
 hug_root() {
   local source="${BASH_SOURCE[0]}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peterseibel/hug",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "A wrapper around clasp for managing Google Apps Script projects",
   "bin": {
     "hug": "bin/hug"