@maccesar/titools 2.0.7 → 2.2.0

package/lib/prompts/selectCancel.js

@@ -0,0 +1,204 @@
+import {
+  Separator,
+  ValidationError,
+  createPrompt,
+  isBackspaceKey,
+  isDownKey,
+  isEnterKey,
+  isNumberKey,
+  isUpKey,
+  makeTheme,
+  useEffect,
+  useKeypress,
+  useMemo,
+  usePagination,
+  usePrefix,
+  useRef,
+  useState,
+} from '@inquirer/core';
+import { cursorHide } from '@inquirer/ansi';
+import { styleText } from 'node:util';
+import figures from '@inquirer/figures';
+
+const selectTheme = {
+  icon: { cursor: figures.pointer },
+  style: {
+    disabled: (text) => styleText('dim', `- ${text}`),
+    description: (text) => styleText('cyan', text),
+    keysHelpTip: (keys) =>
+      keys
+        .map(([key, action]) => `${styleText('bold', key)} ${styleText('dim', action)}`)
+        .join(styleText('dim', ' • ')),
+  },
+  indexMode: 'hidden',
+  keybindings: [],
+};
+
+function isSelectable(item) {
+  return !Separator.isSeparator(item) && !item.disabled;
+}
+
+function normalizeChoices(choices) {
+  return choices.map((choice) => {
+    if (Separator.isSeparator(choice)) return choice;
+    if (typeof choice !== 'object' || choice === null || !('value' in choice)) {
+      const name = String(choice);
+      return {
+        value: choice,
+        name,
+        short: name,
+        disabled: false,
+      };
+    }
+    const name = choice.name ?? String(choice.value);
+    const normalizedChoice = {
+      value: choice.value,
+      name,
+      short: choice.short ?? name,
+      disabled: choice.disabled ?? false,
+    };
+    if (choice.description) {
+      normalizedChoice.description = choice.description;
+    }
+    return normalizedChoice;
+  });
+}
+
+const selectCancel = createPrompt((config, done) => {
+  const { loop = true, pageSize = 7, cancelValue = 'cancel' } = config;
+  const theme = makeTheme(selectTheme, config.theme);
+  const { keybindings } = theme;
+  const [status, setStatus] = useState('idle');
+  const [cancelled, setCancelled] = useState(false);
+  const prefix = usePrefix({ status, theme });
+  const searchTimeoutRef = useRef();
+  const searchEnabled = !keybindings.includes('vim');
+  const items = useMemo(() => normalizeChoices(config.choices), [config.choices]);
+  const bounds = useMemo(() => {
+    const first = items.findIndex(isSelectable);
+    const last = items.findLastIndex(isSelectable);
+    if (first === -1) {
+      throw new ValidationError('[select prompt] No selectable choices. All choices are disabled.');
+    }
+    return { first, last };
+  }, [items]);
+  const defaultItemIndex = useMemo(() => {
+    if (!('default' in config)) return -1;
+    return items.findIndex((item) => isSelectable(item) && item.value === config.default);
+  }, [config.default, items]);
+  const [active, setActive] = useState(defaultItemIndex === -1 ? bounds.first : defaultItemIndex);
+  const selectedChoice = items[active];
+
+  useKeypress((key, rl) => {
+    clearTimeout(searchTimeoutRef.current);
+    if (key.name?.toLowerCase() === 'q') {
+      setCancelled(true);
+      setStatus('done');
+      done(cancelValue);
+    } else if (isEnterKey(key)) {
+      setStatus('done');
+      done(selectedChoice.value);
+    }
+    else if (isUpKey(key, keybindings) || isDownKey(key, keybindings)) {
+      rl.clearLine(0);
+      if (
+        loop ||
+        (isUpKey(key, keybindings) && active !== bounds.first) ||
+        (isDownKey(key, keybindings) && active !== bounds.last)
+      ) {
+        const offset = isUpKey(key, keybindings) ? -1 : 1;
+        let next = active;
+        do {
+          next = (next + offset + items.length) % items.length;
+        } while (!isSelectable(items[next]));
+        setActive(next);
+      }
+    } else if (isNumberKey(key) && !Number.isNaN(Number(rl.line))) {
+      const selectedIndex = Number(rl.line) - 1;
+      let selectableIndex = -1;
+      const position = items.findIndex((item) => {
+        if (Separator.isSeparator(item)) return false;
+        selectableIndex++;
+        return selectableIndex === selectedIndex;
+      });
+      const item = items[position];
+      if (item != null && isSelectable(item)) {
+        setActive(position);
+      }
+      searchTimeoutRef.current = setTimeout(() => {
+        rl.clearLine(0);
+      }, 700);
+    } else if (isBackspaceKey(key)) {
+      rl.clearLine(0);
+    } else if (searchEnabled) {
+      const searchTerm = rl.line.toLowerCase();
+      const matchIndex = items.findIndex((item) => {
+        if (Separator.isSeparator(item) || !isSelectable(item)) return false;
+        return item.name.toLowerCase().startsWith(searchTerm);
+      });
+      if (matchIndex !== -1) {
+        setActive(matchIndex);
+      }
+      searchTimeoutRef.current = setTimeout(() => {
+        rl.clearLine(0);
+      }, 700);
+    }
+  });
+
+  useEffect(() => () => {
+    clearTimeout(searchTimeoutRef.current);
+  }, []);
+
+  const message = theme.style.message(config.message, status);
+  const helpLine = theme.style.keysHelpTip([
+    ['↑↓', 'navigate'],
+    ['⏎', 'select'],
+    ['q', 'quit'],
+  ]);
+  let separatorCount = 0;
+  const page = usePagination({
+    items,
+    active,
+    renderItem({ item, isActive, index }) {
+      if (Separator.isSeparator(item)) {
+        separatorCount++;
+        return ` ${item.separator}`;
+      }
+      const indexLabel = theme.indexMode === 'number' ? `${index + 1 - separatorCount}. ` : '';
+      if (item.disabled) {
+        const disabledLabel = typeof item.disabled === 'string' ? item.disabled : '(disabled)';
+        return theme.style.disabled(`${indexLabel}${item.name} ${disabledLabel}`);
+      }
+      const color = isActive ? theme.style.highlight : (x) => x;
+      const cursor = isActive ? theme.icon.cursor : ` `;
+      return color(`${cursor} ${indexLabel}${item.name}`);
+    },
+    pageSize,
+    loop,
+  });
+
+  if (status === 'done') {
+    if (cancelled) {
+      return [prefix, message].filter(Boolean).join(' ');
+    }
+    return [prefix, message, theme.style.answer(selectedChoice.short)]
+      .filter(Boolean)
+      .join(' ');
+  }
+
+  const { description } = selectedChoice;
+  const lines = [
+    [prefix, message].filter(Boolean).join(' '),
+    page,
+    ' ',
+    description ? theme.style.description(description) : '',
+    helpLine,
+  ]
+    .filter(Boolean)
+    .join('\n')
+    .trimEnd();
+  return `${lines}${cursorHide}`;
+});
+
+export { Separator };
+export default selectCancel;

package/lib/symlink.js

@@ -4,8 +4,8 @@
  */
 
 import { mkdirSync, existsSync } from 'fs';
-import { symlink, readlink, unlink } from 'fs/promises';
-import { join, dirname } from 'path';
+import { symlink, readlink, unlink, lstat } from 'fs/promises';
+import { join, dirname, relative } from 'path';
 import { copy, remove } from 'fs-extra';
 import { isWindows } from './platform.js';
 
@@ -13,9 +13,10 @@ import { isWindows } from './platform.js';
  * Create a symlink or copy as fallback
  * @param {string} target - Target path (what the symlink points to)
  * @param {string} path - Symlink path (where to create it)
+ * @param {boolean} useRelative - Whether to use a relative path for the symlink
  * @returns {Promise<boolean>} True if successful
  */
-export async function createSymlinkOrCopy(target, path) {
+export async function createSymlinkOrCopy(target, path, useRelative = false) {
   // Ensure parent directory exists
   const dir = dirname(path);
   if (!existsSync(dir)) {
@@ -27,9 +28,16 @@ export async function createSymlinkOrCopy(target, path) {
     await removePath(path);
   }
 
+  // Determine final target path
+  let finalTarget = target;
+  if (useRelative) {
+    finalTarget = relative(dirname(path), target);
+  }
+
   // Try creating symlink first
   try {
-    await symlink(target, path, 'dir');
+    // Windows requires 'junction' or 'dir' for directory symlinks
+    await symlink(finalTarget, path, 'dir');
     return true;
   } catch (error) {
     // On Windows or if symlink fails, copy the directory
@@ -64,11 +72,12 @@ async function removePath(path) {
  * Create symlinks for all skills to a platform directory
  * @param {string} platformSkillsDir - Platform skills directory
  * @param {Array} skills - List of skill names
+ * @param {string} baseDir - Optional base directory for target resolution
  * @returns {Promise<Object>} Results object with success/failure counts
  */
-export async function createSkillSymlinks(platformSkillsDir, skills) {
+export async function createSkillSymlinks(platformSkillsDir, skills, baseDir) {
   const { getAgentsSkillsDir } = await import('./config.js');
-  const agentsSkillsDir = getAgentsSkillsDir();
+  const agentsSkillsDir = getAgentsSkillsDir(baseDir);
 
   const results = {
     linked: [],
@@ -80,11 +89,14 @@ export async function createSkillSymlinks(platformSkillsDir, skills) {
     mkdirSync(platformSkillsDir, { recursive: true });
   }
 
+  // Use relative symlinks if we are in a local installation
+  const useRelative = !!baseDir;
+
   for (const skill of skills) {
     const target = join(agentsSkillsDir, skill);
     const linkPath = join(platformSkillsDir, skill);
 
-    if (await createSymlinkOrCopy(target, linkPath)) {
+    if (await createSymlinkOrCopy(target, linkPath, useRelative)) {
       results.linked.push(skill);
     } else {
       results.failed.push(skill);

package/lib/utils.js

@@ -40,20 +40,21 @@ export function removeOldBlock(filePath) {
   }
 
   const content = readFileSync(filePath, 'utf8');
-  // Regex to match any Titanium knowledge block (old or new)
-  const regex = /[\s\S]*?<!-- TITANIUM-KNOWLEDGE-(v[\d.]+|START) -->[\s\S]*?<!-- (END-TITANIUM-KNOWLEDGE|TITANIUM-KNOWLEDGE-END) -->[\s\S]*?\n*/g;
+  // Surgical regex to match ONLY the Titanium knowledge block
+  const blockRegex = /\n*<!-- TITANIUM-KNOWLEDGE-(v[\d.]+|START) -->[\s\S]*?<!-- (END-TITANIUM-KNOWLEDGE|TITANIUM-KNOWLEDGE-END) -->\n*/g;
 
-  const newContent = content.replace(regex, '\n\n');
+  const newContent = content.replace(blockRegex, '\n').trimEnd();
 
-  writeFileSync(filePath, newContent, 'utf8');
+  writeFileSync(filePath, newContent + '\n', 'utf8');
   return true;
 }
 
 /**
  * Build the compressed documentation index dynamically by scanning skills
+ * @param {string} rootPath - The root path to use in the index (default: ~/.agents/skills)
  * @returns {string} The compressed index section
  */
-export function buildKnowledgeIndex() {
+export function buildKnowledgeIndex(rootPath = '~/.agents/skills') {
   let skills = [];
 
   try {
@@ -84,18 +85,19 @@ export function buildKnowledgeIndex() {
   // Note: Using \u0060 to avoid backtick parsing issues in template literals
   return '### Compressed Documentation Index\n\n' +
     '\u0060\u0060\u0060\n' +
-    '[Titanium SDK Docs Index]|root: ~/.agents/skills\n' +
+    `[Titanium SDK Docs Index]|root: ${rootPath}\n` +
     '|' + indexEntries.join('\n|') + '\n' +
     '\u0060\u0060\u0060';
 }
 
 /**
  * Create the Titanium knowledge block content dynamically
+ * @param {string} rootPath - The root path to use in the index
  * @returns {string} The knowledge block content
  */
-export function createKnowledgeBlock() {
+export function createKnowledgeBlock(rootPath) {
   // Build the compressed index dynamically
-  const compressedIndex = buildKnowledgeIndex();
+  const compressedIndex = buildKnowledgeIndex(rootPath);
 
   // Build the knowledge block using template literals
   const blockHeader = `${BLOCK_START}\n<!-- Version: ${TITANIUM_KNOWLEDGE_VERSION} -->`;
@@ -108,27 +110,28 @@ Always consult the documentation files below rather than relying on training dat
 
 This knowledge index is based on the latest Titanium SDK documentation.`;
 
-  return `\n\n${blockHeader}\n${commentContent}\n\n${compressedIndex}\n${BLOCK_END}\n`;
+  return `\n${blockHeader}\n${commentContent}\n\n${compressedIndex}\n${BLOCK_END}\n`;
 }
 
 /**
  * Add or update Titanium knowledge block in a file
  * @param {string} filePath - Path to the file
+ * @param {string} rootPath - Optional root path for the index
  * @returns {boolean} True if file was updated
  */
-export function addOrUpdateBlock(filePath) {
+export function addOrUpdateBlock(filePath, rootPath) {
   let content = '';
 
   if (existsSync(filePath)) {
     content = readFileSync(filePath, 'utf8');
   }
 
-  const block = createKnowledgeBlock();
+  const block = createKnowledgeBlock(rootPath);
 
   // Regex to find ALL existing blocks (old versioned or new static)
   // Global flag /g is CRITICAL here to remove every single occurrence
   const globalBlockRegex = /<!-- TITANIUM-KNOWLEDGE-(v[\d.]+|START) -->[\s\S]*?<!-- (END-TITANIUM-KNOWLEDGE|TITANIUM-KNOWLEDGE-END) -->/g;
-  
+
   // Clean up all existing blocks to prevent accumulation
   content = content.replace(globalBlockRegex, '').trim();
 
@@ -216,11 +219,8 @@ export function formatList(items) {
  * @returns {Array} Array of version parts
  */
 export function parseVersion(version) {
-  return version
-    .replace('.GA', '')
-    .replace('.RC', '-')
-    .split(/[.-]/)
-    .map((v) => parseInt(v, 10) || 0);
+  const matches = version.match(/\d+/g) || [];
+  return matches.map((v) => parseInt(v, 10));
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maccesar/titools",
-  "version": "2.0.7",
+  "version": "2.2.0",
   "description": "Titanium SDK skills and agents for AI coding assistants (Claude Code, Gemini CLI, Codex CLI)",
   "main": "lib/index.js",
   "type": "module",
@@ -41,23 +41,23 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "chalk": "^5.3.0",
-    "commander": "^12.0.0",
-    "fs-extra": "^11.2.0",
-    "inquirer": "^9.2.0",
-    "ora": "^8.0.0",
-    "tar": "^7.4.3"
+    "@inquirer/prompts": "^8.2.0",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.3",
+    "fs-extra": "^11.3.3",
+    "ora": "^9.1.0",
+    "tar": "^7.5.7"
   },
   "devDependencies": {
-    "eslint": "^8.57.0",
-    "prettier": "^3.2.0"
+    "eslint": "^9.39.2",
+    "prettier": "^3.8.1"
   },
   "files": [
     "bin/",
     "lib/",
     "skills/",
     "agents/",
-    "AGENTS-TEMPLATE.md",
+    "AGENTS-VERCEL-RESEARCH.md",
     "scripts/titools-docs"
   ],
   "publishConfig": {

package/skills/alloy-guides/SKILL.md

@@ -26,28 +26,6 @@ This skill automatically detects Alloy projects when invoked and provides framew
 - **Not detected** → Indicates this skill is for Alloy projects only, does not suggest Alloy-specific features
 :::
 
-## Table of Contents
-
-- [Alloy MVC Framework Guide](#alloy-mvc-framework-guide)
-  - [Project Detection](#project-detection)
-  - [Table of Contents](#table-of-contents)
-  - [Quick Reference](#quick-reference)
-  - [Project Structure](#project-structure)
-  - [MVC Quick Start](#mvc-quick-start)
-  - [Key Concepts](#key-concepts)
-  - [Critical Rules](#critical-rules)
-    - [Platform-Specific Properties in TSS](#platform-specific-properties-in-tss)
-  - [Common Patterns](#common-patterns)
-    - [Creating a Model](#creating-a-model)
-    - [Data Binding](#data-binding)
-    - [Platform-Specific Code](#platform-specific-code)
-    - [Widget Usage](#widget-usage)
-  - [Compilation Process](#compilation-process)
-  - [References](#references)
-  - [Related Skills](#related-skills)
-
----
-
 ## Quick Reference
 
 | Topic                                            | Reference File                                                          |
@@ -61,7 +39,7 @@ This skill automatically detects Alloy projects when invoked and provides framew
 | Controllers-less views, patterns                 | [VIEWS_WITHOUT_CONTROLLERS.md](references/VIEWS_WITHOUT_CONTROLLERS.md) |
 | Creating and using widgets                       | [WIDGETS.md](references/WIDGETS.md)                                     |
 | CLI commands, code generation                    | [CLI_TASKS.md](references/CLI_TASKS.md)                                 |
-| PurgeTSS integration and features                | [PURGETSS.md](references/PURGETSS.md)                                   |
+| PurgeTSS integration (optional addon)            | [PURGETSS.md](references/PURGETSS.md)                                   |
 
 ## Project Structure
 
@@ -156,7 +134,7 @@ Using `Ti.UI.iOS.*` or `Ti.UI.Android.*` properties in TSS WITHOUT platform modi
 
 **Available modifiers:** `[platform=ios]`, `[platform=android]`, `[formFactor=handheld]`, `[formFactor=tablet]`, `[if=Alloy.Globals.customVar]`
 
-**For more platform-specific patterns, see** [Platform Modifiers (purgetss)](skills/purgetss/references/platform-modifiers.md) or [Platform UI guides (ti-ui)](skills/ti-ui/references/platform-ui-ios.md).
+**For more platform-specific patterns, see** [Code Conventions (ti-expert)](skills/ti-expert/references/code-conventions.md#platform--device-modifiers) or [Platform UI guides (ti-ui)](skills/ti-ui/references/platform-ui-ios.md).
 :::
 
 ## Common Patterns
@@ -206,9 +184,9 @@ Read detailed documentation from the reference files listed above based on your
 
 For tasks beyond Alloy MVC basics, use these complementary skills:
 
-| Task                                      | Use This Skill |
-| ----------------------------------------- | -------------- |
-| Modern architecture, services, patterns   | `alloy-expert` |
-| Alloy CLI, config files, debugging errors | `alloy-howtos` |
-| Utility-first styling with PurgeTSS       | `purgetss`     |
-| Native features (location, push, media)   | `ti-howtos`    |
+| Task                                           | Use This Skill |
+| ---------------------------------------------- | -------------- |
+| Modern architecture, services, patterns        | `ti-expert`    |
+| Alloy CLI, config files, debugging errors      | `alloy-howtos` |
+| Utility-first styling with PurgeTSS (optional) | `purgetss`     |
+| Native features (location, push, media)        | `ti-howtos`    |

package/skills/alloy-guides/references/CLI_TASKS.md

@@ -1,24 +1,6 @@
 # Alloy Tasks with the CLI
 
-## Table of Contents
-
-- [Alloy Tasks with the CLI](#alloy-tasks-with-the-cli)
-  - [Table of Contents](#table-of-contents)
-  - [Creating a New Application](#creating-a-new-application)
-  - [Creating a New Application Using a Test Application](#creating-a-new-application-using-a-test-application)
-  - [Generating Components](#generating-components)
-    - [Generating a Controller](#generating-a-controller)
-    - [Generating a View](#generating-a-view)
-    - [Generating a Style](#generating-a-style)
-    - [Generating a Model](#generating-a-model)
-    - [Generating a Migration](#generating-a-migration)
-    - [Generating a Widget](#generating-a-widget)
-    - [Generating alloy.jmk](#generating-alloyjmk)
-  - [Extracting Localization Strings](#extracting-localization-strings)
-  - [Compiling a Specific View-Controller](#compiling-a-specific-view-controller)
-  - [Building an Application](#building-an-application)
-  - [Installing Special Project Components](#installing-special-project-components)
-    - [Installing the Compiler Plugin](#installing-the-compiler-plugin)
+Alloy provides command-line interface (CLI) tasks to create a new project, generate skeleton components such as controllers and models, and compile the source files into the Titanium project.
 
 ## Creating a New Application
 
@@ -88,7 +70,7 @@ To generate a style for a view-controller:
 alloy generate style <name> [--widgetname <widget_name>]
 ```
 
-Alloy uses the id and attribute names in the markup file to populate the skeleton style file. This creates `app/styles/<name>.tss`.
+Alloy uses the id and attribute names in the markup file to populate the skeleton style file. This creates `app/styles/<name>.tss`. If you add new `id` or `class` attributes to the markup file, running either of these commands updates the style file with the new attributes.
 
 To generate style files for all view-controllers:
 
@@ -104,7 +86,7 @@ To generate a model:
 alloy generate model <name> <adapter> [<col_name_1>:<col_type_1> <col_name_2>:<col_type_2> ...] [-o path_to_project/app]
 ```
 
-The fourth parameter selects the adapter type: `sql` for SQLite or `properties` for local storage.
+The fourth parameter selects the adapter type: `sql` for SQLite or `properties` for local storage. The fifth parameter defines the table schema. This is required for `sql` and `properties` adapter types.
 
 This creates `app/models/<name>.js`, and `app/migrations/DATETIME_<name>.js` if the adapter type is 'sql'.
 
@@ -148,8 +130,8 @@ alloy extract-i18n [language] [--apply]
 
 **Parameters**:
 
-* `language` – Optional. Two-letter language code (`en` or `es`). Default is `en`.
-* `--apply` – Optional. Writes new entries to `strings.xml`. Without it, displays a preview.
+* `language` – Optional. Two-letter language code (`en`, `es`, etc.). Default is `en`.
+* `--apply` – Optional. Writes new entries to `strings.xml`. Without it, displays a preview. This is a safe operation: it only adds new entries and never removes existing ones.
 
 Supported functions:
 
@@ -197,7 +179,15 @@ Running with `--apply`:
 alloy extract-i18n --apply
 ```
 
-Generates `app/i18n/en/strings.xml`:
+Generates `app/i18n/en/strings.xml`.
+
+To generate strings for another language, pass the language code:
+
+```bash
+alloy extract-i18n es --apply
+```
+
+This generates `app/i18n/es/strings.xml`.
 
 ```xml
 <resources>

package/skills/alloy-guides/references/CONCEPTS.md

@@ -1,26 +1,5 @@
 # Alloy Concepts
 
-## Table of Contents
-
-- [Alloy Concepts](#alloy-concepts)
-  - [Table of Contents](#table-of-contents)
-  - [Overview](#overview)
-  - [Model-View-Controller](#model-view-controller)
-    - [Alloy: MVC with Backbone](#alloy-mvc-with-backbone)
-  - [Alloy and the Titanium SDK](#alloy-and-the-titanium-sdk)
-    - [Titanium SDK to Alloy Mapping](#titanium-sdk-to-alloy-mapping)
-  - [Convention over Configuration](#convention-over-configuration)
-    - [Platform-Specific Resources](#platform-specific-resources)
-  - [Widgets](#widgets)
-  - [Builtins](#builtins)
-  - [Compilation Process](#compilation-process)
-    - [Cleanup](#cleanup)
-    - [Build Configuration](#build-configuration)
-    - [Alloy Framework, Assets, and Lib](#alloy-framework-assets-and-lib)
-    - [Model-View-Controller and Widget Generation](#model-view-controller-and-widget-generation)
-    - [Main Application](#main-application)
-    - [Code Optimization](#code-optimization)
-
 ## Overview
 
 This guide covers the important concepts related to the Alloy framework, including the model-view-controller framework, convention-over-configuration design, widgets, and built-in support from Backbone.js and Underscore.js.
@@ -59,14 +38,15 @@ For assets, such as images, any references to the `Resources` folder in the Tita
 
 | Titanium SDK Component                                                                  | Alloy Component                                                                                                                                               |
 | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Titanium.UI.* Objects**                                                               | **XML element**. Remove the namespace. For some elements, you may need to assign the `ns` attribute.                                                          |
+| **Titanium.UI.\* Objects** (and others: `Ti.Android.Menu`, `Ti.Facebook.LoginButton`, `Ti.Map`, `Ti.Media.VideoPlayer`) | **XML element**. Remove the namespace. For some elements, you may need to assign the `ns` attribute. Some objects are implicitly assigned namespaces by Alloy. |
 | `Titanium.UI.createButton();`                                                           | `<Button />` creates a button                                                                                                                                 |
 |                                                                                         | **TSS element**. Remove the namespace.                                                                                                                        |
 |                                                                                         | `"Button":{ /* Button attributes */ }`                                                                                                                        |
 | **Titanium Object properties**                                                          | **XML attribute** if the property can be expressed as a string, number or Titanium SDK constant.                                                              |
 | `Titanium.UI.createButton({text: "Foobar", top: 0, width: Ti.UI.SIZE});`                | `<Button title="Foobar" top="0" width="Ti.UI.SIZE"/>`                                                                                                         |
-|                                                                                         | **TSS attribute** if the property can be directly expressed as a string, number, Titanium SDK constant, dictionary or array.                                  |
+|                                                                                         | **TSS attribute** if the property can be directly expressed as a string, number, Titanium SDK constant, dictionary or array. Indirectly, you can assign a method or value to the `Alloy.Globals` or `Alloy.CFG` namespace and reference it in the TSS file. |
 |                                                                                         | `"Button":{ title: "Foobar", top: 0, width: Ti.UI.SIZE }`                                                                                                     |
+| **Titanium Object properties (proxy)**                                                  | Some properties that take Titanium objects can be expressed inline using XML tags (Property Mapping). See [VIEWS_XML.md](./VIEWS_XML.md#property-mapping).     |
 | **Titanium Object methods**                                                             | Use in the controller code. You need to define the `id` attribute of the object in the XML markup, so the object can be referenced in the controller.         |
 | `const button = Titanium.UI.createButton(); button.setTitle('Push Me!');`               | `// Need to give the object an ID: <Button id="button" />` then `$.button.setTitle('Push Me!');`                                                              |
 | **Titanium Object events**                                                              | XML attribute to bind a callback in the associated controller. Capitalize the first character of the event name and append 'on' to the beginning of the name. |
@@ -84,7 +64,7 @@ The following is a list of directories and files that can be found in an Alloy p
 | `app/alloy.jmk`   | Build configuration file. See Build Configuration File (alloy.jmk).                                                                                                                                                                                                                         |
 | `app/alloy.js`    | Initializer file used to preconfigure components or override Alloy methods before the main controller is executed.                                                                                                                                                                          |
 | `app/config.json` | Project configuration file. See Project Configuration File (config.json).                                                                                                                                                                                                                   |
-| `app/assets`      | Contains image assets and other files that need to be copied into the `Resources` directory. Reference these files in the code without the 'app/assets' path.                                                                                                                               |
+| `app/assets`      | Contains image assets and other files that need to be copied into the `Resources` directory. Reference these files in the code without the 'app/assets' path (and without the platform-specific folder if it is inside one).                                                                 |
 | `app/controllers` | Contains controllers in the format `filename.js` to a corresponding view file `app/views/filename.xml`.                                                                                                                                                                                     |
 | `app/i18n`        | Since Alloy 1.8.0 and Titanium 5.2.0 Language Strings are sourced from `app/i18n` and Alloy will generate the `i18n` folder in the project root.                                                                                                                                            |
 | `app/lib`         | Contains application-specific library code, typically in the CommonJS format.                                                                                                                                                                                                               |
@@ -96,7 +76,7 @@ The following is a list of directories and files that can be found in an Alloy p
 | `app/themes`      | Contains themes to customize the assets and styles of the entire GUI.                                                                                                                                                                                                                       |
 | `app/views`       | Contains views in the format `filename.xml` with the optional corresponding files `app/controllers/filename.js` and `app/styles/filename.tss`.                                                                                                                                              |
 | `app/widgets`     | Contains widget files. Each widget will have its own `app`-like directory structure.                                                                                                                                                                                                        |
-| `i18n`            | Since Alloy 1.8.0 and Titanium 5.2.0 Language Strings are sourced from `app/i18n` and Alloy will generate the `i18n` folder in the project root.                                                                                                                                            |
+| `i18n`            | Since Alloy 1.8.0 and Titanium 5.2.0 Language Strings are sourced from `app/i18n` and Alloy will generate the `i18n` folder in the project root. Before Alloy 1.8.0, the `i18n` folder was managed in the project root directly.                                                            |
 | `Resources`       | Contains the Titanium files generated by the Alloy interface from the `app` directory. All files will be overwritten each time the application is built. Since Alloy 1.3.0, Alloy creates a separate Titanium project for each platform you build for in the `Resources/<platform>` folder. |
 
 **Notes:** the `lib`, `migrations`, `themes` and `widgets` folders are not automatically generated when creating a new project. The `migrations` and `widgets` folder will be generated by the Alloy command-line interface if any of those components are generated. The `lib` and `themes` folders will need to be manually created.

package/skills/alloy-guides/references/CONTROLLERS.md

@@ -1,22 +1,5 @@
 # Alloy Controllers
 
-## Table of Contents
-
-- [Alloy Controllers](#alloy-controllers)
-  - [Table of Contents](#table-of-contents)
-  - [Overview](#overview)
-  - [Controllers](#controllers)
-    - [Events](#events)
-    - [Inheritance](#inheritance)
-    - [Conditional Code](#conditional-code)
-    - [Passing Arguments](#passing-arguments)
-    - [Global Namespace](#global-namespace)
-  - [Initializer File (alloy.js)](#initializer-file-alloyjs)
-  - [Library Code and CommonJS Modules](#library-code-and-commonjs-modules)
-    - [Specs Folder](#specs-folder)
-    - [Platform-Specific Library Folders](#platform-specific-library-folders)
-    - [Extending Alloy, Underscore.js and Backbone.js](#extending-alloy-underscorejs-and-backbonejs)
-
 ## Overview
 
 This topic covers how to write controller code as well as other JavaScript files excluding models. Some traditional Titanium development is required, since Alloy controllers make direct calls to the Titanium SDK API to manipulate UI objects and access non-UI APIs.
@@ -132,8 +115,8 @@ The following are the constants defined by Alloy for use in the controller code:
 * `ENV_DEV` : true if the current compiler target is built for development (running in the simulator or emulator)
 * `ENV_TEST` : true if the current compiler target is built for testing on a device
 * `ENV_PRODUCTION` : true if the current compiler target is built for production (running after a packaged installation)
-* `DIST_ADHOC` (since Alloy 1.4.0) : true if the current compiler target is built for iOS Ad Hoc distribution
-* `DIST_STORE` (since Alloy 1.4.0) : true if the current compiler target is built for deployment to the Google Play Store or iTunes App Store
+* `DIST_ADHOC` (since Alloy 1.4.0) : true if the current compiler target is built for iOS Ad Hoc distribution, for example, if you set the `-T dist-adhoc` option when building with the Titanium CLI. Note that `ENV_PRODUCTION` will be true too since this deployment is only for production builds.
+* `DIST_STORE` (since Alloy 1.4.0) : true if the current compiler target is built for deployment to the Google Play Store or iTunes App Store, for example, if you set the `-T dist-appstore` or `-T dist-playstore` option. Note that `ENV_PRODUCTION` will be true too since this deployment is only for production builds.
 
 For example, since iOS devices do not include a back button, the application can conditionally add one to a window controller: