forms-angular 0.12.0-beta.21 → 0.12.0-beta.211

package/dist/client/index.d.ts

@@ -1,15 +1,57 @@
 declare module fng {
-  var formsAngular: angular.IModule;
+  export interface IFng extends angular.IModule {
+    beforeProcess?: (scope: IFormScope, cb: (err?: Error) => void) => void;
+    title?: { prefix?: string; suffix?: string };
+    // when provided, the named function (assumed to be present on $rootscope) will be used to determine the visibility
+    // of menu items and control groups
+    hiddenSecurityFuncName?: string;
+    // when provided, the named function (assumed to be present on $rootscope) will be used to determine the disabled
+    // state of menu items and individual form input controls
+    disabledSecurityFuncName?: string;
+    // when provided, the named function (assumed to be present on $rootscope) will be called each time a new page
+    // or popup is accessed, providing the host app with the opportunity to confirm whether there are ANY hidden elements
+    // at all on that page.  where there are not, we can optimise by skipping logic relating to DOM element visibility.
+    skipHiddenSecurityFuncName?: string;
+    // when provided, the named function (assumed to be present on $rootscope) will be called each time a new page
+    // or popup is accessed, providing the host app with the opportunity to confirm whether there are ANY disabled elements
+    // at all on that page.  where there are not, we can optimise by skipping logic relating to disabling DOM elements.
+    skipDisabledSecurityFuncName?: string;
+    // when provided, the named function (assumed to be present on $rootscope) will be called each time a new page
+    // or popup is accessed, providing the host app with the opportunity to confirm whether there are ANY elements on that
+    // page that require their child elements to be disabled.  where there are not, we can optimise by skipping 
+    // disabled ancestor checks.
+    skipDisabledAncestorSecurityFuncName?: string;
+    // how the function identified by elemSecurityFuncName should be bound.  "instant" means that it will be called
+    // as the markup is being constructed, with 'hidden' elements not included in the markup at all, and disable elements
+    // given a simple DISABLED attribute.  this is the most efficient approach.  "one-time" will add ng-hide and
+    // ng-disabled directives to the relevant elements, with one-time binding to the security function.  this is
+    // also reasonably efficient (but not as efficient as "instant" due to the need for watches).  "normal" will not use
+    // one-time binding, which has the potential to be highly resource-intensive on large forms.  which
+    // option is chosen will depend upon when the function identified by elemSecurityFuncName will be ready to
+    // make the necessary determination.
+    elemSecurityFuncBinding?: "instant" | "one-time" | "normal";
+    hideableAttr?: string; // an attribute to mark all elements that can be hidden using security
+    disableableAttr?: string; // an attribute to mark all elements that can be disabled using security
+    disableableAncestorAttr?: string; // an attribute to mark all elements whose children can all be disabled using "disabled + children" security
+    // if an element's id is a partial match on any of this array's contents, it will never be marked with hideableAttr/disableableAttr
+    ignoreIdsForHideableOrDisableableAttrs?: string[]; 
+  }
+  var formsAngular: IFng;
 
   /*
   Type definitions for types that are used on both the client and the server
    */
+  type formStyle = "inline" | "vertical" | "horizontal" | "horizontalCompact" | "stacked";
 
-  export interface IFngLookupReference {
-    type: 'lookup';
-    collection: string
+  export interface IBaseArrayLookupReference {
+    property: string;
+    value: string;
   }
 
+  interface ILookupItem {
+    id: string;
+    text: string;
+  }
   /*
   IInternalLookupreference makes it possible to look up from a list (of key / value pairs) in the current record.  For example
 
@@ -20,13 +62,11 @@ declare module fng {
   var ESchema = new Schema({
     warehouse_name: {type: String, list: {}},
     shelves: {type: [ShelfSchema]},
-    favouriteShelf: {type: Schema.Types.ObjectId, ref: {type: 'internal', property: 'shelves', value:'location'};
+    favouriteShelf: {type: Schema.Types.ObjectId, internalRef: {property: 'shelves', value:'location'};
   });
    */
-  export interface IFngInternalLookupReference {
-    type: 'internal';
-    property: string;
-    value: string;
+  export interface IFngInternalLookupReference extends IBaseArrayLookupReference {
+    noConvert?: boolean; // can be used by a tricksy hack to get around nesting limitations
   }
 
   /*
@@ -36,18 +76,15 @@ declare module fng {
   const LSchemaDef : IFngSchemaDefinition = {
     descriptin: {type: String, required: true, list: {}},
     warehouse: {type: Schema.Types.ObjectId, ref:'k_referencing_self_collection', form: {directive: 'fng-ui-select', fngUiSelect: {fngAjax: true}}},
-    shelf: {type: Schema.Types.ObjectId, ref: {type: 'lookupList', collection:'k_referencing_self_collection', id:'$warehouse', property: 'shelves', value:'location'}},
+    shelf: {type: Schema.Types.ObjectId, lookupListRef: {collection:'k_referencing_self_collection', id:'$warehouse', property: 'shelves', value:'location'}},
   };
   */
-  export interface IFngLookupListReference {
-    type: 'lookupList';
-    collection: string;   // collection that contains the list
+  export interface IFngLookupListReference extends IBaseArrayLookupReference {
+    collection: string; // collection that contains the list
     /*
     Some means of calculating _id in collection.  If it starts with $ then it is property in record
     */
     id: string;
-    property: string;
-    value: string;
   }
 
   /*
@@ -66,7 +103,7 @@ declare module fng {
    */
   export interface IFngShowWhen {
     lhs: any;
-    comp: 'eq' | 'ne' | 'gt' | 'gte' | 'lt' | 'lte';
+    comp: "eq" | "ne" | "gt" | "gte" | "lt" | "lte";
     rhs: any;
   }
 
@@ -74,11 +111,15 @@ declare module fng {
   link allows the setting up of hyperlinks for lookup reference fields
   */
   export interface IFngLinkSetup {
-    linkOnly?: boolean;  // if true (which at the time of writing is the only option supported) then the input element is not generated.
-    form?: string;    // can be used to generate a link to a custom schema
-    text?: string;   // the literal value used for the link. If this property is omitted then text is generated from the field values of the document referred to by the link.
+    linkOnly?: boolean; // if true then the input element is not generated (this overrides label)
+    label?: boolean; // Make a link out of the label (causes text to be overridden) (this overrides text)
+    form?: string; // can be used to generate a link to a custom schema
+    linktab?: string; // can be used to generate a link to a tab on a form
+    text?: string; // the literal value used for the link. If this property is omitted then text is generated from the field values of the document referred to by the link.
   }
 
+  export type FieldSizeString = "mini" | "small" | "medium" | "large" | "xlarge" | "xxlarge" | "block-level"; // sets control width.  Default is 'medium''
+
   export interface IFngSchemaTypeFormOpts {
     /*
       The input type to be generated - which must be compatible with the Mongoose type.
@@ -97,33 +138,36 @@ declare module fng {
      */
     type?: string;
 
-    hidden?: boolean;   // inhibits this schema key from appearing on the generated form.
-    label?: string | null;   // overrides the default input label. label:null suppresses the label altogether.
-    ref?: IFngLookupReference | IFngInternalLookupReference;
-
+    hidden?: boolean; // inhibits this schema key from appearing on the generated form.
+    label?: string | null; // overrides the default input label. label:null suppresses the label altogether.
+    ref?: string; // reference to another collection
+    internalRef?: IFngInternalLookupReference;
+    lookupListRef?: IFngLookupListReference;
     id?: string; // specifies the id of the input field (which defaults to f_name)
 
-    placeHolder?: string // adds placeholder text to the input (depending on data type).
-    help?: string;  // adds help text under the input.
-    helpInline?: string;  // adds help to the right of the input.
-    popup?: string;  // adds popup help as specified.
-    order?: number;  // allows user to specify the order / tab order of this field in the form. This overrides the position in the Mongoose schema.
-    size?: 'mini' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge' | 'block-level';  // sets control width.  Default is 'medium''
-    readonly?: boolean;  // adds the readonly attribute to the generated input (currently doesn't work with date - and perhaps other types).
-    rows?: number | 'auto';  // sets the number of rows in inputs (such as textarea) that support this. Setting rows to "auto" makes the textarea expand to fit the content, rather than create a scrollbar.
-    tab?: string;  // Used to divide a large form up into a tabset with multiple tabs
-    showWhen?: IFngShowWhen | string;  // allows conditional display of fields based on values elsewhere.  string must be an abular expression.
+    placeHolder?: string; // adds placeholder text to the input (depending on data type).
+    help?: string; // adds help text under the input.
+    helpInline?: string; // adds help to the right of the input.
+    popup?: string; // adds title (popup help) as specified.
+    ariaLabel?: string; // adds aria-label as specified.
+    order?: number; // allows user to specify the order / tab order of this field in the form. This overrides the position in the Mongoose schema.
+    size?: FieldSizeString;
+    readonly?: boolean | string; // adds the readonly or ng-readonly attribute to the generated input (currently doesn't work with date - and perhaps other types).
+    rows?: number | "auto"; // sets the number of rows in inputs (such as textarea) that support this. Setting rows to "auto" makes the textarea expand to fit the content, rather than create a scrollbar.
+    tab?: string; // Used to divide a large form up into a tabset with multiple tabs
+    showWhen?: IFngShowWhen | string; // allows conditional display of fields based on values elsewhere.  string must be an abular expression.
 
     /*
       add: 'class="myClass"' allows custom styling of a specific input
     Angular model options can be used - for example add: 'ng-model-options="{updateOn: \'default blur\', debounce: { \'default\': 500, \'blur\': 0 }}" '
     custom validation directives, such as the timezone validation in this schema
     */
-    add?: string;    //  allows arbitrary attributes to be added to the input tag.
+    add?: string; //  allows arbitrary attributes to be added to the input tag.
 
-    class?: string;  // allows arbitrary classes to be added to the input tag.
-    inlineRadio?: boolean;  // (only valid when type is radio) should be set to true to present all radio button options in a single line
-    link?: IFngLinkSetup; // handles displaying links for IFngLookupReference lookups
+    class?: string; // allows arbitrary classes to be added to the input tag.
+    inlineRadio?: boolean; // (only valid when type is radio) should be set to true to present all radio button options in a single line
+    link?: IFngLinkSetup; // handles displaying links for ref lookups
+    asText?: boolean; // (only valid when type is ObjectId) should be set to true to force a simple text input rather than a select.  presumed for advanced cases where the objectid is going to be pasted in.
 
     /*
       With a select / radio type you can specify the options.
@@ -146,17 +190,35 @@ declare module fng {
     /*
     The next few options relate to the handling and display of arrays (including arrays of subdocuments)
      */
-    noAdd?: boolean; // inhibits an Add button being generated for arrays.
+    noAdd?: boolean | string; // inhibits an Add button being generated for arrays.
+    noneIndicator?: boolean; // show "None" where there's no add button and no array items
     unshift?: boolean; // (for arrays of sub documents) puts an add button in the sub schema header which allows insertion of new sub documents at the beginning of the array.
-    noRemove?: boolean;  // inhibits a Remove button being generated for array elements.
-    formstyle?: 'inline' | 'vertical' | 'horizontal' | 'horizontalCompact';  // (only valid on a sub schema) sets style of sub form.
-    sortable? : boolean;  // Allows drag and drop sorting of arrays - requires angular-ui-sortable
+    noRemove?: boolean | string; // inhibits a Remove button being generated for array elements.
+    formstyle?: formStyle; // (only valid on a sub schema) sets style of sub form.
+    sortable?: boolean | string; // Allows drag and drop sorting of arrays - requires angular-ui-sortable
+    ngClass?: string; // Allows for conditional per-item styling through the addition of an ng-class expression to the class list of li elements created for each item in the array
+    filterable?: boolean; // Add a data-ng-hide to all array elements, referring to subDoc._hidden.  Does not actually (yet) provide a UI for managing this property, however (which needs to be done via an external directive)
+    subDocContainerType?:
+      | "fieldset"
+      | "well"
+      | "well-large"
+      | "well-small"
+      | string
+      | ((info) => { before: ""; after: "" }); // allows each element in the array to be nested in a container
+    subDocContainerProps?: any; // the parameters that will be passed if subDocContainerType is a function
 
     /*
     The next section relates to the display of sub documents
      */
     customSubDoc?: string; // Allows you to specify custom HTML (which may include directives) for the sub doc
+    customHeader?: string; // Allows you to specify custom HTML (which may include directives) for the header of a group of sub docs
     customFooter?: string; // Allows you to specify custom HTML (which may include directives) for the footer of a group of sub docs
+
+    /*
+      Suppresses warnings about attenpting deep nesting which would be logged to console in some circumstances when a
+      directive fakes deep nesting
+     */
+    suppressNestingWarning?: boolean;
   }
 
   // Schema passed from server - derived from Mongoose schema
@@ -164,83 +226,155 @@ declare module fng {
     name: string;
     schema?: Array<IFieldViewInfo>;
     array?: boolean;
-    showIf? : any;
+    showIf?: any;
     required?: boolean;
-    step? : number;
+    step?: number;
   }
 
+  export type fieldType =
+    | "string"
+    | "text"
+    | "textarea"
+    | "number"
+    | "select"
+    | "link"
+    | "date"
+    | "checkbox"
+    | "password"
+    | "radio";
+
   // Schema used internally on client - often derived from IFieldViewInfo passed from server
   export interface IFormInstruction extends IFieldViewInfo {
-    id? : string;   // id of generated DOM element
-    type?: 'string' | 'text' | 'textarea' | 'number' | 'select' | 'link' | 'date' | 'checkbox' | 'password';
-    rows? : number
-    label: string;
+    id?: string; // id of generated DOM element
+    nonUniqueId?: string; // where this field is part of a sub-sub-schema, id is likely to include $index from the sub-schema, to ensure uniqueness.  provide it here without reference to $parent.$index for use in security evaluations.
+    type?: fieldType;
+    defaultValue?: any;
+    rows?: number;
+    label?: string;
     options?: any;
     ids?: any;
     hidden?: boolean;
     tab?: string;
-    add? : string;
-    ref? : any;
-    link? : any;
-    linkText?: string;
-    form?: string;           // the form that is linked to
-    select2? : any;          // deprecated
+    add?: string;
+    ref?: any;
+    link?: any;
+    linktext?: string;
+    linklabel?: boolean;
+    form?: string; // the form that is linked to
+    select2?: any; // deprecated
+    schema?: IFormInstruction[]; // If the field is an array of fields
+    intType?: "date";
+    [directiveOptions: string]: any;
+  }
+
+  interface IContainerInstructions {
+    before?: string;
+    after?: string;
+    omit?: boolean;
   }
 
+  export interface IContainer {
+    /*
+      Type of container, which determines markup.  This is currently only available when the schema is generated by
+      the client for use independent of the BaseController
+      In the case of a string which does not match one of the predefined options
+      the generated container div is given the class of the name
+     */
+    containerType: "fieldset" | "well" | "tabset" | "tab" | "well-large" | "well-small" | string | ((info: IContainer) => IContainerInstructions);
+    title?: string;
+
+    /*
+      h1...h6 will use a header style
+      anything else will be used as a paragraph stype
+     */
+    titleTagOrClass?: string;
+    content: IFormInstruction[];
+  }
+
+  export type IFormSchemaElement = IFormInstruction | IContainer;
+
+  export type IFormSchema = IFormSchemaElement[];
+  export type IControlledFormSchema = IFormInstruction[];
+
   export interface IEnumInstruction {
     repeat: string;
     value: string;
-    label? : string;
+    label?: string;
   }
 
   export interface IFngCtrlState {
     master: any;
-    allowLocationChange: boolean;   // Do we allow location change or prompt for permission
+    allowLocationChange: boolean; // Do we allow location change or prompt for permission
   }
   export interface IRecordHandler {
-    convertToMongoModel(schema: Array<IFieldViewInfo>, anObject: any, prefixLength: number, scope: IFormScope): any;
-    createNew(dataToSave: any, options: any, scope: IFormScope): void;
-    deleteRecord(model: any, id: any, scope: IFormScope, ctrlState: any): void;
-    updateDocument(dataToSave : any, options: any, scope: IFormScope, ctrlState: any) : void;
+    convertToMongoModel(schema: IControlledFormSchema, anObject: any, prefixLength: number, scope: IFormScope): any;
+    createNew(dataToSave: any, options: any, scope: IFormScope, ctrlState: IFngCtrlState): void;
+    deleteRecord(id: string, scope: IFormScope, ctrlState: IFngCtrlState): void;
+    updateDocument(dataToSave: any, options: any, scope: IFormScope, ctrlState: IFngCtrlState): void;
     readRecord($scope: IFormScope, ctrlState);
     scrollTheList($scope: IFormScope);
-    getListData($scope: IFormScope, record, fieldName, listSchema);
+    getListData(record, fieldName, listSchema?, $scope?: IFormScope);
     suffixCleanId(inst, suffix);
-    setData(object, fieldname, element, value);
+    setData(object, fieldname: string, element, value);
+    getData(object, fieldname: string, element?: any);
     setUpLookupOptions(lookupCollection, schemaElement, $scope: IFormScope, ctrlState, handleSchema);
-    setUpLookupListOptions: (ref: IFngLookupListReference, formInstructions: IFormInstruction, $scope: IFormScope, ctrlState: IFngCtrlState) => void;
+    setUpLookupListOptions: (
+      ref: IFngLookupListReference,
+      formInstructions: IFormInstruction,
+      $scope: IFormScope,
+      ctrlState: IFngCtrlState
+    ) => void;
     handleInternalLookup($scope: IFormScope, formInstructions, ref): void;
     preservePristine(element, fn): void;
     convertIdToListValue(id, idsArray, valuesArray, fname);
-    decorateScope($scope:IFormScope, $uibModal, recordHandlerInstance : IRecordHandler, ctrlState);
-    fillFormFromBackendCustomSchema(schema, $scope:IFormScope, formGeneratorInstance, recordHandlerInstance, ctrlState);
+    decorateScope($scope: IFormScope, $uibModal, recordHandlerInstance: IRecordHandler, ctrlState);
+    fillFormFromBackendCustomSchema(
+      schema,
+      $scope: IFormScope,
+      formGeneratorInstance,
+      recordHandlerInstance,
+      ctrlState
+    );
     fillFormWithBackendSchema($scope: IFormScope, formGeneratorInstance, recordHandlerInstance, ctrlState);
     handleError($scope: IFormScope);
   }
 
   export interface IFormGenerator {
-    generateEditUrl(obj, $scope:IFormScope): string;
+    generateEditUrl(obj, $scope: IFormScope): string;
+    generateViewUrl(obj, $scope: IFormScope): string;
     generateNewUrl($scope: IFormScope): string;
     handleFieldType(formInstructions, mongooseType, mongooseOptions, $scope: IFormScope, ctrlState);
-    handleSchema(description: string, source, destForm, destList, prefix, doRecursion: boolean, $scope: IFormScope, ctrlState);
+    handleSchema(
+      description: string,
+      source,
+      destForm,
+      destList,
+      prefix,
+      doRecursion: boolean,
+      $scope: IFormScope,
+      ctrlState
+    );
     updateDataDependentDisplay(curValue, oldValue, force, $scope: IFormScope);
-    add(fieldName, $event, $scope: IFormScope);
-    unshift(fieldName, $event, $scope: IFormScope);
-    remove(fieldName, value, $event, $scope: IFormScope);
+    add(fieldName: string, $event, $scope: IFormScope, modelOverride?: any);
+    unshift(fieldName: string, $event, $scope: IFormScope, modelOverride?: any);
+    remove(fieldName: string, value, $event, $scope: IFormScope, modelOverride?: any);
     hasError(formName, name, index, $scope: IFormScope);
-    decorateScope($scope: IFormScope, formGeneratorInstance, recordHandlerInstance: IRecordHandler, sharedStuff);
+    decorateScope($scope: IFormScope, formGeneratorInstance, recordHandlerInstance: IRecordHandler, sharedStuff, pseudoUrl?: string);
   }
 
   export interface IFngSingleLookupHandler {
     formInstructions: IFormInstruction;
     lastPart: string;
     possibleArray: string;
+    // If the looked-up record changes, we use these fields to see if the old lookup value also exists in the new lookup record
+    oldValue?: string | string[];
+    oldId?: string | string[];
   }
 
   export interface IFngLookupHandler {
     lookupOptions: string[];
     lookupIds: string[];
-    handlers: IFngSingleLookupHandler[]
+    handlers: IFngSingleLookupHandler[];
   }
 
   export interface IFngInternalLookupHandlerInfo extends IFngLookupHandler {
@@ -251,16 +385,32 @@ declare module fng {
     ref: IFngLookupListReference;
   }
 
+  // we cannot use an enum here, so this will have to do.  these are the values expected to be returned by the
+  // function on $rootScope with the name formsAngular.disabledSecurityFuncName.
+  //   false = not disabled,
+  //   true = disabled,
+  //   "+" = this and all child elements disabled
+  export type DisabledOutcome = boolean | "+";
+
+  export interface ISecurableScope extends angular.IScope {
+    // added by ISecurityService
+    isSecurelyHidden: (elemId: string) => boolean;
+    isSecurelyDisabled: (elemId: string) => boolean;
+    requiresDisabledChildren: (elemId: string) => boolean;
+  }
+
   /*
     The scope which contains form data
    */
-  export interface IFormScope extends angular.IScope {
+  export interface IFormScope extends ISecurableScope {
     sharedData: any;
-    modelNameDisplay : string;
+    modelNameDisplay: string;
     modelName: string;
     formName: string;
     alertTitle: any;
+    errorVisible: boolean;
     errorMessage: any;
+    errorHideTimer: number;
     save: any;
     newRecord: boolean;
     initialiseNewRecord?: any;
@@ -271,17 +421,16 @@ declare module fng {
     isCancelDisabled: any;
     isNewDisabled: any;
     isSaveDisabled: any;
-    disabledText: any;
+    whyDisabled: string;
     unconfirmedDelete: boolean;
     getVal: any;
     sortableOptions: any;
-    tabDeselect: any;
-    tabs?: Array<any>;              // In the case of forms that contain a tab set
-    tab?: string;                   // title of the active tab - from the route
+    tabs?: Array<any>; // In the case of forms that contain a tab set
+    tab?: string; // title of the active tab - from the route
     activeTabNo?: number;
-    topLevelFormName: string;       // The name of the form
+    topLevelFormName: string; // The name of the form
     record: any;
-    originalData: any;              // the unconverted data read from the server
+    originalData: any; // the unconverted data read from the server
     phase: any;
     disableFunctions: any;
     dataEventFunctions: any;
@@ -293,10 +442,12 @@ declare module fng {
     conversions: any;
     pageSize: any;
     pagesLoaded: any;
+    redirectOptions?: { redirect?: string; allowChange?: boolean };
     cancel: () => any;
-    showError: (error: any, alertTitle? : string) => void;
+    showError: (error: any, alertTitle?: string) => void;
     prepareForSave: (cb: (error: string, dataToSave?: any) => void) => void;
-    formSchema: IFormInstruction[];
+    setDefaults: (formSchema: IFormSchema, base?: string) => any;
+    formSchema: IControlledFormSchema;
     baseSchema: () => Array<any>;
     setFormDirty: any;
     add: any;
@@ -308,24 +459,46 @@ declare module fng {
     skipCols: any;
     setPristine: any;
     generateEditUrl: any;
+    generateViewUrl: any;
     generateNewUrl: any;
     scrollTheList: any;
     getListData: any;
-    dismissError: any;
+    phaseWatcher: any;
+    dismissError: () => void;
+    stickError: () => void;
+    clearTimeout: () => void;
     handleHttpError: (response: any) => void;
     dropConversionWatcher: () => void;
+    readingRecord?: Promise<any>;
+    onSchemaFetch?: (description: string, source: IFieldViewInfo[]) => void;
+    onSchemaProcessed?: (description: string, formSchema: IFormInstruction[]) => void;
+    updateQueryForTab?: (tab: string) => void;
+    showLoading? : boolean;
+    tabDeselect?: ($event: any, $selectedIndex: number) => void;
+    setUpCustomLookupOptions?: (
+      schemaElement: IFormInstruction,
+      ids: string[],
+      options: string[],
+      baseScope: any
+    ) => void;
   }
 
   export interface IContextMenuDivider {
     divider: boolean;
   }
   export interface IContextMenuOption {
-    // For it to make any sense, a menu option needs one of the next two properties
+    // For it to make any sense, a menu option needs one of the next three properties
     url?: string;
     fn?: () => void;
+    urlFunc?: () => string;
 
-    text: string;
+    // provided to the security hook (see elemSecurityFuncName) - optional where that is not being used
+    id?: string;
+
+    text?: string;
+    textFunc?: () => string;
     isDisabled?: () => boolean;
+    isHidden?: () => boolean;
 
     // Does the option appear in the following contexts?
     listing: boolean;
@@ -334,9 +507,10 @@ declare module fng {
   }
 
   export interface IModelController extends IFormScope {
-    onBaseCtrlReady? : (baseScope: IFormScope) => void;   // Optional callback after form is instantiated
-    onAllReady? : (baseScope: IFormScope) => void;        // Optional callback after form is instantiated and populated
-    contextMenu? : Array<IContextMenuOption | IContextMenuDivider>
+    onBaseCtrlReady?: (baseScope: IFormScope) => void; // Optional callback after form is instantiated
+    onAllReady?: (baseScope: IFormScope) => void; // Optional callback after form is instantiated and populated
+    contextMenu?: Array<IContextMenuOption | IContextMenuDivider>;
+    contextMenuPromise?: Promise<Array<IContextMenuOption | IContextMenuDivider>>;
   }
 
   export interface IBaseFormOptions {
@@ -344,13 +518,13 @@ declare module fng {
      * The style of the form layout.  Supported values are horizontalcompact, horizontal, vertical, inline
      */
     //TODO supported values should be in an enum
-    formstyle?: string;
+    formstyle?: formStyle;
     /**
      * Model on form scope (defaults to record).
      * <li><strong>model</strong> the object in the scope to be bound to the model controller.  Specifying
      * the model inhibits the generation of the <strong>form</strong> tag unless the <strong>forceform</strong> attribute is set to true</li>
      */
-    model? : string;
+    model?: string;
     /**
      * The name to be given to the form - defaults to myForm
      */
@@ -359,60 +533,163 @@ declare module fng {
      * Normally first field in a form gets autofocus set.  Use this to prevent this
      */
     noautofocus?: string;
+    /*
+    Suppress the generation of element ids
+    (sometimes required when using nested form-inputs in a directive)
+     */
+    noid?: boolean;
   }
 
   export interface IFormAttrs extends IFormOptions, angular.IAttributes {
     /**
      * Schema used by the form
      */
-    schema : string;
-    forceform?: string;    // Must be true or omitted.  Forces generation of the <strong>form</strong> tag when model is specified
+    schema: string;
+    forceform?: string; // Must be true or omitted.  Forces generation of the <strong>form</strong> tag when model is specified
+    noid?: boolean;
   }
 
   export interface IFormOptions extends IBaseFormOptions {
-    schema? : string;
+    schema?: string;
     subkey?: string;
     subkeyno?: number;
-    subschema? : string;
-    subschemaroot? : string;
+    subschema?: string;
+    subschemaroot?: string;
+    viewform?: boolean;
+    suppressNestingWarning?: boolean;
   }
 
   export interface IBuiltInRoute {
     route: string;
     state: string;
     templateUrl: string;
-    options? : any;
+    options?: any;
   }
 
   export interface IRoutingConfig {
     hashPrefix: string;
     html5Mode: boolean;
-    routing: string;                // What sort of routing do we want?  ngroute or uirouter.
-                                    // TODO Should be enum
-    prefix: string;                 // How do we want to prefix out routes?  If not empty string then first character must be slash (which is added if not)
-                                    // for example '/db' that gets prepended to all the generated routes.  This can be used to
-                                    // prevent generated routes (which have a lot of parameters) from clashing with other routes in
-                                    // the web app that have nothing to do with CRUD forms
+    routing: string; // What sort of routing do we want?  ngroute or uirouter.
+    // TODO Should be enum
+    prefix: string; // How do we want to prefix out routes?  If not empty string then first character must be slash (which is added if not)
+    // for example '/db' that gets prepended to all the generated routes.  This can be used to
+    // prevent generated routes (which have a lot of parameters) from clashing with other routes in
+    // the web app that have nothing to do with CRUD forms
     fixedRoutes?: Array<IBuiltInRoute>;
-    templateFolder?: string;        // The folder where the templates for base-list, base-edit and base-analysis live.  Internal templates used by default.  For pre 0.7.0 behaviour use 'partials/'
-    add2fngRoutes?: any;            // An object to add to the generated routes.  One use case would be to add {authenticate: true}
-                                    // so that the client authenticates for certain routes
+    templateFolder?: string; // The folder where the templates for base-list, base-edit and base-analysis live.  Internal templates used by default.  For pre 0.7.0 behaviour use 'partials/'
+    add2fngRoutes?: any; // An object to add to the generated routes.  One use case would be to add {authenticate: true}
+    // so that the client authenticates for certain routes
 
-    variantsForDemoWebsite? : any;  // Just for demo website
-    variants?: any;                 // Just for demo website
+    variantsForDemoWebsite?: any; // Just for demo website
+    variants?: any; // Just for demo website
+    onDelete?: string; // Supports literal (such as '/') or 'new' (which will go to a /new of the model) default is to go to the list view
   }
 
   export interface IFngRoute {
-    newRecord?:           boolean;
-    analyse?:             boolean;
-    modelName?:           string;
-    reportSchemaName? :   string;
-    id? :                 string;
-    formName? :           string;
-    tab? :                string;
-    variant? :            string;    // TODO should be enum of supported frameworks
+    newRecord?: boolean;
+    analyse?: boolean;
+    modelName?: string;
+    reportSchemaName?: string;
+    id?: string;
+    formName?: string;
+    tab?: string;
+    variant?: string; // TODO should be enum of supported frameworks
   }
 
+  interface IBuildingBlocks {
+    common: string;
+    sizeClassBS3: string;
+    sizeClassBS2: string;
+    compactClass: string;
+    formControl: string;
+    modelString: string;
+    disableableAncestorStr: string;
+  }
+
+  interface IProcessedAttrs {
+    info: IFormInstruction;
+    options: IFormOptions;
+    directiveOptions: any;
+  }
+
+  interface IGenDisableStrParams {
+    forceNg?: boolean;
+    nonUniqueIdSuffix?: string;
+  }
+  
+
+  interface IPluginHelper {
+    extractFromAttr: (
+      attr: any,
+      directiveName: string
+    ) => { info: IFormInstruction; options: IFormOptions; directiveOptions: any };
+    buildInputMarkup: (
+      scope: angular.IScope,
+      attrs: any,
+      params: {
+        processedAttrs?: IProcessedAttrs;
+        fieldInfoOverrides?: Partial<IFormInstruction>;
+        optionOverrides?: Partial<IFormOptions>;
+        addButtons?: boolean;
+        needsX?: boolean;
+      },
+      generateInputControl: (buildingBlocks: IBuildingBlocks) => string
+    ) => string;
+    genIdString: (scope: angular.IScope, processedAttrs: IProcessedAttrs, idSuffix: string) => string;
+    genDisabledStr: (
+      scope: angular.IScope,
+      processedAttrs: IProcessedAttrs,
+      idSuffix: string,
+      params?: fng.IGenDisableStrParams
+    ) => string;
+    genIdAndDisabledStr: (
+      scope: angular.IScope,
+      processedAttrs: IProcessedAttrs,
+      idSuffix: string,
+      params?: fng.IGenDisableStrParams
+    ) => string;
+    genDateTimePickerDisabledStr: (scope: angular.IScope, processedAttrs: IProcessedAttrs, idSuffix: string) => string;
+    genDateTimePickerIdAndDisabledStr: (
+      scope: angular.IScope,
+      processedAttrs: IProcessedAttrs,
+      idSuffix: string
+    ) => string;
+    genUiSelectIdAndDisabledStr: (
+      scope: angular.IScope,
+      processedAttrs: IProcessedAttrs,
+      idSuffix: string
+    ) => string;
+    handlePseudos: (str: string) => string;
+    genDisableableAncestorStr: (processedAttrs: IProcessedAttrs) => string;
+  }
+
+  interface ISecurityVisibility {
+    omit?: boolean;
+    visibilityAttr?: string;
+  }
+
+  interface IGenerateDisableAttrParams {
+    attr?: string;
+    attrRequiresValue?: boolean;
+    forceNg?: boolean;
+  }
+
+  type SecurityType = "hidden" | "disabled";
+  
+  interface ISecurityService {
+    canDoSecurity: (type: SecurityType) => boolean;
+    canDoSecurityNow: (scope: fng.ISecurableScope, type: SecurityType) => boolean;
+    isSecurelyHidden: (elemId: string, pseudoUrl?: string) => boolean;
+    isSecurelyDisabled: (elemId: string, pseudoUrl?: string) => boolean;
+    decorateSecurableScope: (securableScope: ISecurableScope, params?: { pseudoUrl?: string, overrideSkipping?: boolean }) => void;
+    doSecurityWhenReady: (cb: () => void) => void;
+    considerVisibility: (id: string, scope: fng.ISecurableScope) => ISecurityVisibility;
+    considerContainerVisibility: (contentIds: string[], scope: fng.ISecurableScope) => fng.ISecurityVisibility;
+    getDisableableAttrs: (id: string) => string;
+    getHideableAttrs: (id: string) => string;
+    getDisableableAncestorAttrs: (id: string) => string;
+    generateDisabledAttr: (id: string, scope: fng.ISecurableScope, params?: IGenerateDisableAttrParams) => string;
+  }
 }
 
-declare var formsAngular: angular.IModule;
+declare var formsAngular: fng.IFng;