shortcutkit 2.0.0__tar.gz → 3.1.0__tar.gz

{shortcutkit-2.0.0/src/shortcutkit.egg-info → shortcutkit-3.1.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: shortcutkit
-Version: 2.0.0
-Summary: Build, validate, and sign Apple Shortcuts files from Python. All 449 built-in actions and 1,318 Apple app actions, extracted from the Shortcuts engine.
+Version: 3.1.0
+Summary: Build, validate, and sign Apple Shortcuts files from Python. All 449 built-in actions and 1,265 Apple app actions, extracted from the Shortcuts engine.
 Author: frontboat
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/frontboat/shortcutkit
@@ -51,9 +51,9 @@ are archived ([python-shortcuts](https://github.com/alexander-akhmetov/python-sh
 [Cherri](https://github.com/electrikmilk/cherri) is a separate language with its own compiler.
 
 - All 449 built-in actions as constants, so a typo is an `AttributeError`.
-- 1,318 actions from Apple's apps: Reminders, Notes, Messages, Settings, and 70 more. Only
+- 1,265 actions from Apple's apps: Reminders, Notes, Messages, Settings, and 70 more. Only
   actions the Shortcuts editor offers: the Siri-only intents the app refuses to import are left out.
-- Third-party app actions, given their descriptor.
+- Third-party app actions, named by app and intent.
 - Checked conditions for 150 Find actions, the 14 built-in ones (Filter Files, Find Photos, Find
   Contacts, ...) and 136 in Apple's apps (Find Messages, Find Notes, ...), from the engine's own
   rules, and the properties of what they find.
@@ -114,20 +114,38 @@ found = s.action(actions.MESSAGES_FIND_MESSAGE,
 s.action(actions.SHOWRESULT, Text=text(property_(found, "body")))
 ```
 
+### Dictionaries and types
+
+A dictionary parameter takes a plain dict: strings, `text()` and references are text items, and
+numbers, booleans, lists and nested dicts keep their type, as the editor's item type menu sets it.
+`coerce()` reads a value as one content type, as the variable "Type" menu does, and `property_()` on the
+result takes that class's properties, the menu's "Get" list (`CONTENT_ITEM_PROPERTIES`):
+`property_(coerce(file, "WFGenericFileContentItem"), "File Size")`, checked at run time. An output the catalogue types, by
+class or by the object class it wraps (`CONTENT_ITEM_TYPES`), is checked the same way without a coercion:
+`property_(asked_number, "Name")`. Where a choice decides the output, the literal you pass narrows it:
+`s.action(actions.ASK, WFInputType="Number")` outputs a Number, so only Name is accepted.
+
+```python
+from shortcutkit import coerce
+
+d = s.action(actions.DICTIONARY, WFItems={"name": ref(name), "greeted": True, "tags": ["a", "b"]})
+gid = s.if_(coerce(d, "WFStringContentItem"), "contains", "a")
+s.end_if(gid)
+```
+
 ### Other apps
 
-Pass the identifier and descriptor yourself; the parameters are not checked.
+Name the app and the intent: the identifier is the bundle identifier followed by the intent name, as
+the catalogue identifies an app's own intents, and the descriptor is written as the catalogue's are.
+The parameters are not checked: their keys are the intent's parameter names, from
+`Metadata.appintents/extract.actionsdata` in the app bundle.
 
 ```python
-s.action(
-    "com.example.app.CreateNoteIntent",
-    AppIntentDescriptor={
-        "BundleIdentifier": "com.example.app", "Name": "Example", "TeamIdentifier": "ABCDE12345",
-        "AppIntentIdentifier": "CreateNoteIntent", "ActionRequiresAppInstallation": True,
-    },
-    title=text("Hello"),
-    body=ref(name),
-)
+from shortcutkit import app_intent
+
+app = {"BundleIdentifier": "com.example.app", "Name": "Example", "TeamIdentifier": "ABCDE12345"}
+note = s.action(app_intent(app, "CreateNoteIntent", "Note"), title=text("Hello"), body=ref(name))
+s.action(actions.SHOWRESULT, Text=ref(note))
 ```
 
 ## API
@@ -149,8 +167,12 @@ s.action(
 | `shortcut_input()`, `clipboard()`, `current_date()`, `ask()`, `device_details()`, `current_app()` | Special variables. |
 | `where(*rows)`, `where_any(*rows)` | Conditions for a Find action's `WFContentItemFilter`. |
 | `property_(source, name)` | One property of an action's output or a variable. |
-| `FILTERS`, `ENTITY_PROPERTIES`, `FILTER_OPERATORS`, `CALENDAR_UNITS` | What each Find action can filter on, and each entity type's properties. |
-| `actions`, `ACTIONS`, `get_action(id)` | Action identifiers and their catalog entries. |
+| `coerce(source, class)` | A value read as one content type, the editor's "Type" menu (`CONTENT_ITEM_CLASSES`). |
+| `dictionary(items)` | A dictionary parameter's items; `action()` encodes a plain dict itself. |
+| `app_intent(app, intent, output=None)` | Another app's action, for `s.action()`. |
+| `FILTERS`, `ENTITY_PROPERTIES`, `FILTER_OPERATORS`, `CALENDAR_UNITS`, `CONTENT_ITEM_CLASSES` | What each Find action can filter on, each entity type's properties, and the content types a coercion can name. |
+| `actions`, `ACTIONS`, `get_action(id)` | Action identifiers and their catalog entries: parameters and kinds, output and input types, keywords, description, flags, and the rules under which the editor shows each parameter. |
+| `accepted_by(type)`, `produced_by(type)` | Which actions take a content type as input or as an entity parameter, and which output it. |
 | `PARAM_KINDS`, `PARAM_CHOICES`, `PARAM_VARIABLE_TYPES` | What each parameter accepts. |
 | `CONDITION`, `ICON_COLORS`, `PROVENANCE` | If conditions, icon colors, and the build the data came from. |
 

{shortcutkit-2.0.0 → shortcutkit-3.1.0}/README.md

@@ -30,9 +30,9 @@ are archived ([python-shortcuts](https://github.com/alexander-akhmetov/python-sh
 [Cherri](https://github.com/electrikmilk/cherri) is a separate language with its own compiler.
 
 - All 449 built-in actions as constants, so a typo is an `AttributeError`.
-- 1,318 actions from Apple's apps: Reminders, Notes, Messages, Settings, and 70 more. Only
+- 1,265 actions from Apple's apps: Reminders, Notes, Messages, Settings, and 70 more. Only
   actions the Shortcuts editor offers: the Siri-only intents the app refuses to import are left out.
-- Third-party app actions, given their descriptor.
+- Third-party app actions, named by app and intent.
 - Checked conditions for 150 Find actions, the 14 built-in ones (Filter Files, Find Photos, Find
   Contacts, ...) and 136 in Apple's apps (Find Messages, Find Notes, ...), from the engine's own
   rules, and the properties of what they find.
@@ -93,20 +93,38 @@ found = s.action(actions.MESSAGES_FIND_MESSAGE,
 s.action(actions.SHOWRESULT, Text=text(property_(found, "body")))
 ```
 
+### Dictionaries and types
+
+A dictionary parameter takes a plain dict: strings, `text()` and references are text items, and
+numbers, booleans, lists and nested dicts keep their type, as the editor's item type menu sets it.
+`coerce()` reads a value as one content type, as the variable "Type" menu does, and `property_()` on the
+result takes that class's properties, the menu's "Get" list (`CONTENT_ITEM_PROPERTIES`):
+`property_(coerce(file, "WFGenericFileContentItem"), "File Size")`, checked at run time. An output the catalogue types, by
+class or by the object class it wraps (`CONTENT_ITEM_TYPES`), is checked the same way without a coercion:
+`property_(asked_number, "Name")`. Where a choice decides the output, the literal you pass narrows it:
+`s.action(actions.ASK, WFInputType="Number")` outputs a Number, so only Name is accepted.
+
+```python
+from shortcutkit import coerce
+
+d = s.action(actions.DICTIONARY, WFItems={"name": ref(name), "greeted": True, "tags": ["a", "b"]})
+gid = s.if_(coerce(d, "WFStringContentItem"), "contains", "a")
+s.end_if(gid)
+```
+
 ### Other apps
 
-Pass the identifier and descriptor yourself; the parameters are not checked.
+Name the app and the intent: the identifier is the bundle identifier followed by the intent name, as
+the catalogue identifies an app's own intents, and the descriptor is written as the catalogue's are.
+The parameters are not checked: their keys are the intent's parameter names, from
+`Metadata.appintents/extract.actionsdata` in the app bundle.
 
 ```python
-s.action(
-    "com.example.app.CreateNoteIntent",
-    AppIntentDescriptor={
-        "BundleIdentifier": "com.example.app", "Name": "Example", "TeamIdentifier": "ABCDE12345",
-        "AppIntentIdentifier": "CreateNoteIntent", "ActionRequiresAppInstallation": True,
-    },
-    title=text("Hello"),
-    body=ref(name),
-)
+from shortcutkit import app_intent
+
+app = {"BundleIdentifier": "com.example.app", "Name": "Example", "TeamIdentifier": "ABCDE12345"}
+note = s.action(app_intent(app, "CreateNoteIntent", "Note"), title=text("Hello"), body=ref(name))
+s.action(actions.SHOWRESULT, Text=ref(note))
 ```
 
 ## API
@@ -128,8 +146,12 @@ s.action(
 | `shortcut_input()`, `clipboard()`, `current_date()`, `ask()`, `device_details()`, `current_app()` | Special variables. |
 | `where(*rows)`, `where_any(*rows)` | Conditions for a Find action's `WFContentItemFilter`. |
 | `property_(source, name)` | One property of an action's output or a variable. |
-| `FILTERS`, `ENTITY_PROPERTIES`, `FILTER_OPERATORS`, `CALENDAR_UNITS` | What each Find action can filter on, and each entity type's properties. |
-| `actions`, `ACTIONS`, `get_action(id)` | Action identifiers and their catalog entries. |
+| `coerce(source, class)` | A value read as one content type, the editor's "Type" menu (`CONTENT_ITEM_CLASSES`). |
+| `dictionary(items)` | A dictionary parameter's items; `action()` encodes a plain dict itself. |
+| `app_intent(app, intent, output=None)` | Another app's action, for `s.action()`. |
+| `FILTERS`, `ENTITY_PROPERTIES`, `FILTER_OPERATORS`, `CALENDAR_UNITS`, `CONTENT_ITEM_CLASSES` | What each Find action can filter on, each entity type's properties, and the content types a coercion can name. |
+| `actions`, `ACTIONS`, `get_action(id)` | Action identifiers and their catalog entries: parameters and kinds, output and input types, keywords, description, flags, and the rules under which the editor shows each parameter. |
+| `accepted_by(type)`, `produced_by(type)` | Which actions take a content type as input or as an entity parameter, and which output it. |
 | `PARAM_KINDS`, `PARAM_CHOICES`, `PARAM_VARIABLE_TYPES` | What each parameter accepts. |
 | `CONDITION`, `ICON_COLORS`, `PROVENANCE` | If conditions, icon colors, and the build the data came from. |
 

{shortcutkit-2.0.0 → shortcutkit-3.1.0}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "shortcutkit"
-version = "2.0.0"
-description = "Build, validate, and sign Apple Shortcuts files from Python. All 449 built-in actions and 1,318 Apple app actions, extracted from the Shortcuts engine."
+version = "3.1.0"
+description = "Build, validate, and sign Apple Shortcuts files from Python. All 449 built-in actions and 1,265 Apple app actions, extracted from the Shortcuts engine."
 requires-python = ">=3.9"
 readme = "README.md"
 license = "MIT"

{shortcutkit-2.0.0 → shortcutkit-3.1.0}/src/shortcutkit/__init__.py

@@ -26,7 +26,10 @@ Value helpers return the exact structures WorkflowKit's state classes serialize:
   ask("Prompt")      WFTextTokenAttachment  -> ask each time
   text("a ", ref(x)) WFTextTokenString      -> text with embedded references
   subject(att)       {"Type": "Variable", "Variable": att}  (the If condition's subject; pickers take the bare attachment)
-  property_(x, "body")  a reference to one property of x (a WFPropertyVariableAggrandizement)
+  coerce(x, "WFStringContentItem")  x read as one content type (a WFCoercionVariableAggrandizement; CONTENT_ITEM_CLASSES)
+  property_(x, "body")  one property of x (a WFPropertyVariableAggrandizement; ENTITY_PROPERTIES, CONTENT_ITEM_PROPERTIES)
+  dictionary({...})  WFDictionaryFieldValue  -> a dictionary parameter's items, typed as the editor types them
+  app_intent(app, "CreateNoteIntent")  another app's action, for action(): its identifier and descriptor
   where(row, ...)    Find conditions, encoded by action() for the Find action's entity
 Plain str / int / float / bool / list / datetime are written as-is.
 """
@@ -186,18 +189,110 @@ def subject(attachment):
 
 
 def property_(source, name):
-    """One property of an action's output or of any reference, as the editor's property picker writes
-    it (a WFPropertyVariableAggrandizement): property_(found, "body"), property_(repeat_item(), "date").
-    Given an action whose output is one of Apple's entity types, the name must be one of its
-    properties (ENTITY_PROPERTIES)."""
+    """One property of an action's output or of any reference, as the editor's property picker (the "Get" list
+    under a variable's "Type") writes it (a WFPropertyVariableAggrandizement): property_(found, "body"),
+    property_(repeat_item(), "date"), property_(coerce(file, "WFGenericFileContentItem"), "File Size").
+    When the output's type is known, one of Apple's entity types (ENTITY_PROPERTIES) or a content item class
+    (CONTENT_ITEM_PROPERTIES: named directly, or as the object class the definition names, NSDecimalNumber being a
+    Number, through CONTENT_ITEM_TYPES; also what a coerce()d reference has), the name must be one of its properties."""
+    if _is_reference(source):
+        cls = _coerced_class(source)
+        types = [cls] if cls else []
+    else:
+        declared = (source["_outputClasses"] + [t for t in source.get("_outputTypes", []) if t in ENTITY_PROPERTIES]) if source.get("_outputClasses") else source.get("_outputTypes", [])
+        types = list(dict.fromkeys(t if t in ENTITY_PROPERTIES else _item_class_of(t) for t in declared))
+        types = [t for t in types if t]
+    known = {p for t in types for p in (ENTITY_PROPERTIES.get(t) or CONTENT_ITEM_PROPERTIES.get(t) or [])}
+    if types and name not in known:
+        raise ValueError(f"{' / '.join(types)} has no property {name}; it has {', '.join(sorted(known))}")
+    return _aggrandize(source, {"Type": "WFPropertyVariableAggrandizement", "PropertyName": name})
+
+
+def _item_class_of(type_name):
+    """An output type name as a content item class: itself when it is one, else the class that owns it (CONTENT_ITEM_TYPES)."""
+    return type_name if type_name in CONTENT_ITEM_PROPERTIES else CONTENT_ITEM_TYPES.get(type_name)
+
+
+def _coerced_class(attachment):
+    """The content item class a reference was last coerced to, when it is one the engine lists; else None."""
+    ags = attachment["Value"].get("Aggrandizements")
+    last = ags[-1] if isinstance(ags, list) and ags else None
+    cls = last.get("CoercionItemClass") if isinstance(last, dict) and last.get("Type") == "WFCoercionVariableAggrandizement" else None
+    return cls if cls in CONTENT_ITEM_PROPERTIES else None
+
+
+def _aggrandize(source, aggrandizement):
+    """`source` with one more aggrandizement; an action stands for its output."""
     if not _is_reference(source):
-        entities = [t for t in source.get("_outputTypes", []) if t in ENTITY_PROPERTIES]
-        known = {p for e in entities for p in ENTITY_PROPERTIES[e]}
-        if entities and name not in known:
-            raise ValueError(f"{' / '.join(entities)} has no property {name}; it has {', '.join(sorted(known))}")
         source = ref(source)
     prior = source["Value"].get("Aggrandizements")
-    return _attachment({**source["Value"], "Aggrandizements": [*(prior if isinstance(prior, list) else []), {"Type": "WFPropertyVariableAggrandizement", "PropertyName": name}]})
+    return _attachment({**source["Value"], "Aggrandizements": [*(prior if isinstance(prior, list) else []), aggrandizement]})
+
+
+def coerce(source, to):
+    """`source` read as one content type, as the editor's variable "Type" menu writes it (a
+    WFCoercionVariableAggrandizement): coerce(ref(json), "WFDictionaryContentItem"), coerce(repeat_item(), "WFStringContentItem").
+    The classes are the engine's own list (CONTENT_ITEM_CLASSES, each with the name the editor shows). An If whose
+    subject's type the engine cannot tell (a dictionary value, a repeat item) needs one: without it "is" has nothing
+    to compare against and the run fails (a downstream user's observation; docs/extraction.md, run-time observations)."""
+    if to not in CONTENT_ITEM_CLASSES:
+        raise ValueError(f"no content item class {to}; the engine coerces to {', '.join(CONTENT_ITEM_CLASSES)}")
+    return _aggrandize(source, {"Type": "WFCoercionVariableAggrandizement", "CoercionItemClass": to})
+
+
+def dictionary(items):
+    """A dictionary parameter: Dictionary's items, Get Contents of URL's headers, form and JSON bodies. Strings,
+    text() and references are text items; numbers, booleans, lists and nested dicts keep their type, as the editor's
+    item type menu sets it: dictionary({"apikey": variable("Key"), "count": 5, "nested": {"ok": True}, "tags": ["a", "b"]}).
+    action() encodes a plain dict given for a dictionary key itself, so the call is needed only where the key is untyped."""
+    return {"WFSerializationType": "WFDictionaryFieldValue",
+            "Value": {"WFDictionaryFieldValueItems": [{"WFKey": text(k), **_dictionary_item(v)} for k, v in items.items()]}}
+
+
+def _is_dictionary_items(v):
+    """A plain dict of items for a dictionary parameter (not an encoded value)."""
+    return isinstance(v, dict) and "WFSerializationType" not in v and not (v.get("Type") == "Variable" and "Variable" in v)
+
+
+def _dictionary_item(v):
+    """One item's type code and value, as the dictionary state class writes them back (docs/shortcut-file-format.md §3)."""
+    if isinstance(v, str):
+        return {"WFItemType": 0, "WFValue": text(v)}
+    if isinstance(v, dict) and v.get("WFSerializationType") == "WFTextTokenString":
+        return {"WFItemType": 0, "WFValue": v}
+    if isinstance(v, dict) and v.get("WFSerializationType") == "WFTextTokenAttachment":
+        return {"WFItemType": 0, "WFValue": text(v)}
+    if isinstance(v, bool):
+        return {"WFItemType": 4, "WFValue": {"WFSerializationType": "WFNumberSubstitutableState", "Value": v}}
+    if isinstance(v, (int, float)):
+        return {"WFItemType": 3, "WFValue": text(_number_text(v))}
+    # Array items carry no key; plain text is the bare string, as the engine writes it back.
+    if isinstance(v, (list, tuple)):
+        return {"WFItemType": 2, "WFValue": {"WFSerializationType": "WFArrayParameterState", "Value": [x if isinstance(x, str) else _dictionary_item(x) for x in v]}}
+    # A nested dictionary is wrapped once more than the outer one (the engine serializes it so, and reads the unwrapped form into that).
+    if isinstance(v, dict) and v.get("WFSerializationType") == "WFDictionaryFieldValue":
+        return {"WFItemType": 1, "WFValue": {"WFSerializationType": "WFDictionaryFieldValue", "Value": v}}
+    if _is_dictionary_items(v):
+        return {"WFItemType": 1, "WFValue": {"WFSerializationType": "WFDictionaryFieldValue", "Value": dictionary(v)}}
+    raise ValueError(f"dictionary(): a value must be a str, text(), a reference, a number, a bool, a list or a dict, got {v!r}")
+
+
+def _number_text(n):
+    """A number as JavaScript's String() writes it, so both packages write the same item (5, not 5.0)."""
+    if isinstance(n, float) and n.is_integer():
+        return str(int(n))
+    return repr(n) if isinstance(n, float) else str(n)
+
+
+def app_intent(app, intent, output=None):
+    """Name an App Intents action of an app the catalogue does not cover, for action():
+    s.action(app_intent(app, "CreateNoteIntent", "Note"), title=text("Hi")). `app` holds BundleIdentifier, Name and
+    TeamIdentifier (the bundle's Info.plist and `codesign -dv`); the identifier is the bundle identifier followed by the
+    intent's name, as the catalogue identifies an app's own intents, and the descriptor is written as the catalogue's are
+    (an intent hosted in a framework or extension has another identifier, which action() still takes by hand with an
+    AppIntentDescriptor). `output` names the result for ref() ("Output" when left out). The parameters are not checked: their keys are the intent's parameter names, as
+    Metadata.appintents/extract.actionsdata in the app bundle lists them."""
+    return {"identifier": f"{app['BundleIdentifier']}.{intent}", "descriptor": {**app, "AppIntentIdentifier": intent}, "output": output}
 
 
 def where(*rows):
@@ -322,7 +417,6 @@ def _utc(d):
 
 def picker(attachment):
     """Deprecated, misnamed: this is the If-subject form. Pass a bare reference to picker parameters."""
-    """Wrap an attachment for WFVariablePickerParameter keys (e.g. WFInput on Repeat with Each)."""
     return {"Type": "Variable", "Variable": attachment}
 
 
@@ -360,14 +454,17 @@ class Shortcut:
     def action(self, identifier, /, **params):
         """Append an action and return it; ref() it to use its output. Catalog identifiers are
         checked: unknown keys, wrong value kinds, and unreadable references raise ValueError. Other
-        identifiers pass through unchecked. `identifier` is positional-only, so a parameter can
-        have that name."""
+        identifiers pass through unchecked; app_intent() names another app's action with its descriptor.
+        `identifier` is positional-only, so a parameter can have that name."""
+        intent = identifier if isinstance(identifier, dict) else None
+        if intent:
+            identifier = intent["identifier"]
         definition = self.defs.get(identifier)
         catalog = ACTIONS.get(identifier) or {}
-        descriptor = catalog.get("descriptor")
+        descriptor = catalog.get("descriptor") or (intent or {}).get("descriptor")
         if self.defs and definition is None and not catalog and identifier.startswith("is.workflow."):
             raise ValueError(f"unknown built-in action {identifier}")
-        if definition or descriptor:
+        if definition or catalog.get("descriptor"):
             known = {p.get("Key") for p in (definition or {}).get("Parameters", []) if isinstance(p, dict)}
             known |= {"UUID", "GroupingIdentifier", "WFControlFlowMode", "CustomOutputName"}
             known |= LEGACY_KEYS.get(identifier, set())
@@ -383,7 +480,9 @@ class Shortcut:
         kinds = PARAM_KINDS.get(identifier, {})
         restricted = PARAM_VARIABLE_TYPES.get(identifier, {})
         for key, value in params.items():
-            if _is_where(value) and kinds.get(key) != "filter":
+            # where() rows belong to a Find action's filter key; an untyped action (another app's Find) is refused by
+            # _encode_filter(), which names the missing FILTERS entry.
+            if _is_where(value) and key in kinds and kinds[key] != "filter":
                 raise ValueError(f"{identifier}.{key}: where() rows go only in a Find action's WFContentItemFilter")
             problem = _check_kind(kinds.get(key, "any"), value)
             if problem:
@@ -397,6 +496,7 @@ class Shortcut:
         # token string with one placeholder. Wrap it so ref() works for text keys too.
         params = {k: (text(v) if kinds.get(k) == "text" and _is_reference(v) and v.get("WFSerializationType") == "WFTextTokenAttachment"
                       else subject(v) if kinds.get(k) == "subject" and _is_reference(v) and v.get("WFSerializationType") == "WFTextTokenAttachment"
+                      else dictionary(v) if kinds.get(k) == "dictionary" and _is_dictionary_items(v)
                       else _encode_filter(identifier, v) if _is_where(v) else v)
                   for k, v in params.items()}
         # App Intents actions carry a descriptor naming the app that provides them.
@@ -406,8 +506,17 @@ class Shortcut:
         entry = {"WFWorkflowActionIdentifier": identifier,
                  "WFWorkflowActionParameters": {**head, **params}}
         output = (definition or {}).get("Output", {})
-        entry["_outputName"] = (output.get("OutputName") if isinstance(output, dict) else None) or catalog.get("output")
+        entry["_outputName"] = (output.get("OutputName") if isinstance(output, dict) else None) or catalog.get("output") or (intent or {}).get("output")
         entry["_outputTypes"] = list(catalog.get("outputTypes") or (output.get("Types") if isinstance(output, dict) else []) or [])
+        # The engine's answer to what comes out: for a choice that decides it (OUTPUT_CLASSES_BY), the literal given selects
+        # its classes and a reference means any of them; otherwise the classes for the default parameters.
+        by = OUTPUT_CLASSES_BY.get(identifier) if isinstance(identifier, str) else None
+        deciding = next((k for k in by if k in params), None) if by else None
+        if deciding:
+            v = params[deciding]
+            entry["_outputClasses"] = list(by[deciding][v]) if isinstance(v, str) and v in by[deciding] else sorted({c for cs in by[deciding].values() for c in cs})
+        elif catalog.get("outputClasses"):
+            entry["_outputClasses"] = list(catalog["outputClasses"])
         if isinstance(entry["_outputName"], dict):
             entry["_outputName"] = entry["_outputName"].get("format")
         self.actions.append(entry)
@@ -523,7 +632,11 @@ def get_action(identifier, definitions=DEFINITIONS):
     if entry is None:
         return None
     out = {"identifier": identifier, "name": entry["name"], "params": list(entry["params"]),
-           "kinds": dict(PARAM_KINDS.get(identifier, {})), "output": entry.get("output"), "outputTypes": list(entry.get("outputTypes", []))}
+           "kinds": dict(PARAM_KINDS.get(identifier, {})), "output": entry.get("output"), "outputTypes": list(entry.get("outputTypes", [])),
+           "inputTypes": list(entry.get("inputTypes", [])), "keywords": list(entry.get("keywords", []))}
+    for k in ("outputClasses", "inputKey", "inputRequired", "description", "descriptionNote", "descriptionResult", "discontinued", "unavailable", "requiresUnlock", "disabledOn", "requires"):
+        if entry.get(k):
+            out[k] = copy.deepcopy(entry[k])
     if entry.get("descriptor"):
         out["descriptor"] = entry["descriptor"]
     defs = _load_definitions(definitions) if definitions else {}
@@ -532,6 +645,20 @@ def get_action(identifier, definitions=DEFINITIONS):
     return out
 
 
+def accepted_by(type_name):
+    """Where a value of one content type can go: every built-in whose input takes it (with the key the input
+    lands in) and every App Intents parameter typed as that entity, as (identifier, key) pairs. Declared types
+    only; Shortcuts converts between many types at run time, so this is what the editor would list."""
+    out = [(i, e.get("inputKey") or "WFInput") for i, e in ACTIONS.items() if type_name in e.get("inputTypes", [])]
+    out += [(i, k) for i, keys in PARAM_ENTITY_TYPES.items() for k, t in keys.items() if t == type_name]
+    return out
+
+
+def produced_by(type_name):
+    """Every action whose output is declared as this content type (ACTIONS[id]["outputTypes"])."""
+    return [i for i, e in ACTIONS.items() if type_name in e.get("outputTypes", []) or type_name in e.get("outputClasses", [])]
+
+
 def demo(out):
     out = pathlib.Path(out)
     s = Shortcut(out.stem, color="Teal")
@@ -550,13 +677,13 @@ def demo(out):
 
 
 from . import actions  # noqa: E402  (generated identifier constants and ACTIONS metadata)
-from .actions import ACTIONS, PARAM_KINDS, PARAM_CHOICES, PARAM_VARIABLE_TYPES  # noqa: E402
-from .entities import FILTERS, FILTER_OPERATORS, CALENDAR_UNITS, BYTE_COUNT_UNITS, BOUNDED_FILTERS, ENTITY_PROPERTIES  # noqa: E402  (generated Find filters and entity properties)
+from .actions import ACTIONS, PARAM_KINDS, PARAM_CHOICES, PARAM_VARIABLE_TYPES, PARAM_ENTITY_TYPES, OUTPUT_CLASSES_BY  # noqa: E402
+from .entities import FILTERS, FILTER_OPERATORS, CALENDAR_UNITS, BYTE_COUNT_UNITS, BOUNDED_FILTERS, ENTITY_PROPERTIES, CONTENT_ITEM_CLASSES, CONTENT_ITEM_PROPERTIES, CONTENT_ITEM_TYPES  # noqa: E402  (generated Find filters, entity properties, content item classes, their properties and owned types)
 
 PROVENANCE = json.load(open(HERE / "data" / "provenance.json")) if (HERE / "data" / "provenance.json").exists() else {}
 """Which macOS and Shortcuts build the bundled data was extracted from."""
 
-__all__ = ["actions", "ACTIONS", "PARAM_KINDS", "PARAM_CHOICES", "PARAM_VARIABLE_TYPES", "PROVENANCE", "get_action", "repeat_item", "repeat_index", "subject", "Shortcut", "ref", "variable", "shortcut_input", "clipboard", "current_date", "ask", "device_details", "current_app", "picker", "text",
-           "property_", "where", "where_any", "FILTERS", "FILTER_OPERATORS", "CALENDAR_UNITS", "BYTE_COUNT_UNITS", "BOUNDED_FILTERS", "ENTITY_PROPERTIES",
+__all__ = ["actions", "ACTIONS", "PARAM_KINDS", "PARAM_CHOICES", "PARAM_VARIABLE_TYPES", "PROVENANCE", "get_action", "accepted_by", "produced_by", "PARAM_ENTITY_TYPES", "OUTPUT_CLASSES_BY", "repeat_item", "repeat_index", "subject", "Shortcut", "ref", "variable", "shortcut_input", "clipboard", "current_date", "ask", "device_details", "current_app", "picker", "text",
+           "property_", "coerce", "dictionary", "app_intent", "where", "where_any", "FILTERS", "FILTER_OPERATORS", "CALENDAR_UNITS", "BYTE_COUNT_UNITS", "BOUNDED_FILTERS", "ENTITY_PROPERTIES", "CONTENT_ITEM_CLASSES", "CONTENT_ITEM_PROPERTIES", "CONTENT_ITEM_TYPES",
            "ICON_COLORS", "CONDITION", "DEFAULT_GLYPH", "LEGACY_KEYS", "demo"]
-__version__ = "2.0.0"
+__version__ = "3.1.0"