forms-angular 0.12.0-beta.264 → 0.12.0-beta.265

package/dist/client/index.d.ts

@@ -2,6 +2,7 @@ declare module fng {
   export interface IFng extends angular.IModule {
     beforeProcess?: (scope: IFormScope, cb: (err?: Error) => void) => void;
     beforeHandleIncomingDataPromises?: () => angular.IPromise<any>[];
+    pseudo?: (token: string, upperFirst: boolean) => string;
     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
@@ -271,6 +272,7 @@ declare module fng {
     select2?: any; // deprecated
     schema?: IFormInstruction[]; // If the field is an array of fields
     intType?: "date";
+    coloffset?: number;
     [directiveOptions: string]: any;
   }
 
@@ -307,7 +309,7 @@ declare module fng {
       anything else will be used as a paragraph stype
      */
     titleTagOrClass?: string;
-    content: IFormInstruction[];
+    content: IFormSchemaElement[];
   }
 
   export type IFormSchemaElement = IFormInstruction | IContainer;
@@ -508,12 +510,7 @@ declare module fng {
   export interface IContextMenuDivider {
     divider: boolean;
   }
-  export interface IContextMenuOption {
-    // For it to make any sense, a menu option needs one of the next three properties
-    url?: string;
-    fn?: () => void;
-    urlFunc?: () => string;
-
+  export interface IContextMenuBaseOption {
     // provided to the security hook (see elemSecurityFuncName) - optional where that is not being used
     id?: string;
 
@@ -527,6 +524,18 @@ declare module fng {
     creating: boolean;
     editing: boolean;
   }
+  export interface IContextSubMenuOption extends IContextMenuBaseOption {
+    items: ContextMenuItem[];
+  }
+  export interface IContextMenuOption extends IContextMenuBaseOption{
+    // For it to make any sense, a menu option needs one of the next three properties
+    url?: string;
+    fn?: (...args: any) => void;
+    urlFunc?: () => string;
+    broadcast?: string;
+    args?: any[];
+  }
+  export type ContextMenuItem = IContextMenuOption | IContextSubMenuOption | IContextMenuDivider;
 
   export interface IModelCtrlService {
     loadControllerAndMenu: (sharedData: any, titleCaseModelName: string, level: number, needDivider: boolean, scope: angular.IScope) => void;
@@ -535,8 +544,8 @@ 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>;
-    contextMenuPromise?: Promise<Array<IContextMenuOption | IContextMenuDivider>>;
+    contextMenu?: ContextMenuItem[];
+    contextMenuPromise?: Promise<ContextMenuItem[]>;
   }
 
   export interface IBaseFormOptions {
@@ -652,7 +661,8 @@ declare module fng {
   interface IPluginHelperService {
     extractFromAttr: (
       attr: any,
-      directiveName: string
+      directiveName: string,
+      scope: fng.IFormScope
     ) => { info: IFormInstruction; options: IFormOptions; directiveOptions: any };
     buildInputMarkup: (
       scope: angular.IScope,
@@ -690,7 +700,7 @@ declare module fng {
       processedAttrs: IProcessedAttrs,
       idSuffix: string
     ) => string;
-    handlePseudos: (str: string) => string;
+    handlePseudos: (scope: fng.IFormScope, str: string) => string;
     genDisableableAncestorStr: (processedAttrs: IProcessedAttrs) => string;
   }
 
@@ -814,14 +824,15 @@ declare module fng {
     allInputsVars: (scope: angular.IScope, fieldInfo: fng.IFormInstruction, options: fng.IFormOptions, modelString: string, idString: string, nameString: string) => Partial<fng.IBuildingBlocks>;
     inputChrome: (value: string, fieldInfo: fng.IFormInstruction, options: fng.IFormOptions, markupVars) => string;
     generateSimpleInput: (common: string, fieldInfo: fng.IFormInstruction, options: fng.IFormOptions) => string;
-    controlDivClasses: (options: fng.IFormOptions) => string[];
+    controlDivClasses: (options: fng.IFormOptions, fieldInfo: fng.IFormInstruction) => string[];
     handleInputAndControlDiv: (inputMarkup: string, controlDivClasses: string[]) => string;
     handleArrayInputAndControlDiv: (inputMarkup: string, controlDivClasses: string[], scope: fng.IFormScope, info: fng.IFormInstruction, options: fng.IFormOptions) => string;
     addTextInputMarkup: (allInputsVars: Partial<fng.IBuildingBlocks>, fieldInfo: fng.IFormInstruction, requiredStr: string) => string;
     handleReadOnlyDisabled: (partialFieldInfo: { name: string, id?: string, nonUniqueId?: string, readonly?: boolean | string }, scope: fng.IFormScope) => string[];
     generateArrayElementIdString: (idString: string, info: fng.IFormInstruction, options: fng.IFormOptions) => string;
     genDisableableAncestorStr: (id: string) => string;
-    generateNgShow(showWhen: IFngShowWhen, model: string): string;
+    generateNgShow: (showWhen: IFngShowWhen, model: string) => string;
+    handlePseudos: (scope: fng.IFormScope, str: string, dynamicFuncName?: string) => string;
   }
 }
 

package/dist/server/data_form.js

@@ -235,7 +235,35 @@ class FormsAngular {
                 }
             }
         }
-        extend(resource.options, this.preprocess(resource, resource.model.schema['paths']));
+        extend(resource.options, this.preprocess(resource, resource.model.schema.paths));
+        resource.options.searchFields = [];
+        // commenting this out, as we used to do this in a place where the type of resource.model.schema was any,
+        // so it was allowed, despite the fact that _indexes is not a known property of a mongoose schema.
+        // changing it to indexes does compile, but this might not be what was intended
+        //
+        // for (let j = 0; j < resource.model.schema._indexes.length; j++) {
+        //     let attributes = resource.model.schema._indexes[j][0];
+        //     let field = Object.keys(attributes)[0];
+        //     if (resource.options.searchFields.indexOf(field) === -1) {
+        //         resource.options.searchFields.push(field);
+        //     }
+        // }
+        function addSearchFields(schema, pathSoFar) {
+            for (let path in schema.paths) {
+                if (path !== '_id' && schema.paths.hasOwnProperty(path)) {
+                    const qualifiedPath = pathSoFar ? pathSoFar + "." + path : path;
+                    if (schema.paths[path].options.index && !schema.paths[path].options.noSearch) {
+                        if (resource.options.searchFields.indexOf(qualifiedPath) === -1) {
+                            resource.options.searchFields.push(qualifiedPath);
+                        }
+                    }
+                    else if (schema.paths[path].schema) {
+                        addSearchFields(schema.paths[path].schema, qualifiedPath);
+                    }
+                }
+            }
+        }
+        addSearchFields(resource.model.schema, "");
         if (resource.options.searchImportance) {
             this.searchFunc = async.forEachSeries;
         }
@@ -376,31 +404,14 @@ class FormsAngular {
         for (let i = 0; i < resourceCount; i++) {
             let resource = resourcesToSearch[i];
             if (resourceCount === 1 || (resource.options.searchImportance !== false && (!collectionName || collectionNameLower === resource.resourceNameLower || resource.options?.synonyms?.find(s => s.name === collectionNameLower)))) {
-                let schema = resource.model.schema;
-                let indexedFields = [];
-                for (let j = 0; j < schema._indexes.length; j++) {
-                    let attributes = schema._indexes[j][0];
-                    let field = Object.keys(attributes)[0];
-                    if (indexedFields.indexOf(field) === -1) {
-                        indexedFields.push(field);
-                    }
-                }
-                for (let path in schema.paths) {
-                    if (path !== '_id' && schema.paths.hasOwnProperty(path)) {
-                        if (schema.paths[path]._index && !schema.paths[path].options.noSearch) {
-                            if (indexedFields.indexOf(path) === -1) {
-                                indexedFields.push(path);
-                            }
-                        }
-                    }
-                }
-                if (indexedFields.length === 0) {
+                let searchFields = resource.options.searchFields;
+                if (searchFields.length === 0) {
                     console.log('ERROR: Searching on a collection with no indexes ' + resource.resourceName);
                 }
                 let synonymObj = resource.options?.synonyms?.find(s => s.name.toLowerCase() === collectionNameLower);
                 const synonymFilter = synonymObj?.filter;
-                for (let m = 0; m < indexedFields.length; m++) {
-                    let searchObj = { resource: resource, field: indexedFields[m] };
+                for (let m = 0; m < searchFields.length; m++) {
+                    let searchObj = { resource: resource, field: searchFields[m] };
                     if (synonymFilter) {
                         searchObj.filter = synonymFilter;
                     }
@@ -734,7 +745,7 @@ class FormsAngular {
             }, {});
         }
         let outPath = {}, hiddenFields = [], listFields = [];
-        if (resource && !resource.options?.doNotCacheSchema && resource.preprocessed && resource.preprocessed[formName || "__default"]) {
+        if (resource && resource.preprocessed && resource.preprocessed[formName || "__default"]) {
             return resource.preprocessed[formName || "__default"].paths;
         }
         else {
@@ -798,7 +809,7 @@ class FormsAngular {
             if (listFields.length > 0) {
                 returnObj.listFields = listFields;
             }
-            if (resource && !resource.options?.doNotCacheSchema) {
+            if (resource) {
                 resource.preprocessed = resource.preprocessed || {};
                 resource.preprocessed[formName || "__default"] = returnObj;
             }

package/dist/server/index.d.ts

@@ -57,7 +57,6 @@ declare module fngServer {
         idIsList?: IIdIsList,
         searchResultFormat?: ISearchResultFormatter,
         searchOrder?: any,
-        doNotCacheSchema?: boolean,          // useful if bespoke fields can be added at runtime, for instance
         listOrder?: any,
         onAccess?: (req, cb) => void,
         searchFunc?: SearchFunc;
@@ -72,7 +71,8 @@ declare module fngServer {
         // below here are autogenerated
         listFields?: ListField[];   // added after preprocess
         dependents?: DependencyList;   // can be added by generateDependencyList
-        hide? : string[];
+        hide? : string[];   // added after preprocess
+        searchFields? : string[];   // added after preprocess
         paths?: Paths;
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "author": "Mark Chapman <support@forms-angular.org>",
   "description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose.  Opinionated or what?",
   "homepage": "http://forms-angular.org",
-  "version": "0.12.0-beta.264",
+  "version": "0.12.0-beta.265",
   "engines": {
     "node": ">=8.x",
     "npm": ">=5.x"